diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 7c71ab86d1f7e387fc3df63b48df07231f111862 (patch) | |
tree | 30ba2d2f840ff5fd458b6113e9c3f2e8a71d510d /filters/kspread | |
parent | afbfdc507bfaafc8824a9808311d57a9ece87510 (diff) | |
download | koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.tar.gz koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.zip |
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
Diffstat (limited to 'filters/kspread')
-rw-r--r-- | filters/kspread/csv/dialogui.ui | 2 | ||||
-rw-r--r-- | filters/kspread/csv/exportdialogui.ui | 2 | ||||
-rw-r--r-- | filters/kspread/excel/sidewinder/excel.cpp | 14 | ||||
-rw-r--r-- | filters/kspread/excel/sidewinder/excel.h | 4 | ||||
-rw-r--r-- | filters/kspread/gnumeric/gnumeric.xsd | 2 | ||||
-rw-r--r-- | filters/kspread/gnumeric/status.html | 2 | ||||
-rw-r--r-- | filters/kspread/html/exportwidget.ui | 2 | ||||
-rw-r--r-- | filters/kspread/kexi/kspread_kexiimportdialogbase.ui | 2 | ||||
-rw-r--r-- | filters/kspread/latex/export/latexexportdia.ui | 2 | ||||
-rw-r--r-- | filters/kspread/opencalc/opencalcimport.cc | 2 | ||||
-rw-r--r-- | filters/kspread/opencalc/status.html | 4 |
11 files changed, 19 insertions, 19 deletions
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index 7cf0d28c..8c3a72cf 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -545,7 +545,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index 9b38a41f..45eb6914 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -502,7 +502,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index 99ac0eaa..7d128a5b 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -4175,7 +4175,7 @@ public: unsigned formatIndex; bool locked; bool formulaHidden; - unsigned tqparentStyle; + unsigned parentStyle; unsigned horizontalAlignment; unsigned verticalAlignment; bool textWrap; @@ -4207,7 +4207,7 @@ XFRecord::XFRecord(): Record() d->formatIndex = 0; d->locked = false; d->formulaHidden = false; - d->tqparentStyle = 0; + d->parentStyle = 0; d->horizontalAlignment = Left; d->verticalAlignment = VCentered; d->textWrap = false; @@ -4249,7 +4249,7 @@ XFRecord& XFRecord::operator=( const XFRecord& xf ) d->formatIndex = xf.formatIndex(); d->locked = xf.locked(); d->formulaHidden = xf.formulaHidden(); - d->tqparentStyle = xf.tqparentStyle(); + d->parentStyle = xf.parentStyle(); d->horizontalAlignment = xf.horizontalAlignment(); d->verticalAlignment = xf.verticalAlignment(); d->textWrap = xf.textWrap(); @@ -4315,14 +4315,14 @@ void XFRecord::setFormulaHidden( bool f ) d->formulaHidden = f; } -unsigned XFRecord::tqparentStyle() const +unsigned XFRecord::parentStyle() const { - return d->tqparentStyle; + return d->parentStyle; } void XFRecord::setParentStyle( unsigned p ) { - d->tqparentStyle = p; + d->parentStyle = p; } unsigned XFRecord::horizontalAlignment() const @@ -4657,7 +4657,7 @@ void XFRecord::setData( unsigned size, const unsigned char* data ) void XFRecord::dump( std::ostream& out ) const { out << "XF" << std::endl; - out << " Parent Style : " << tqparentStyle() << std::endl; + out << " Parent Style : " << parentStyle() << std::endl; out << " Font Index : " << fontIndex() << std::endl; out << " Format Index : " << formatIndex() << std::endl; out << " Locked : " << (locked()?"Yes":"No") << std::endl; diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h index 51c9efcd..8450d643 100644 --- a/filters/kspread/excel/sidewinder/excel.h +++ b/filters/kspread/excel/sidewinder/excel.h @@ -2783,14 +2783,14 @@ public: * * \sa setParentStyle */ - unsigned tqparentStyle() const; + unsigned parentStyle() const; /** * Sets the index of the tqparent stlye of this format. * This refers to the index of the XFormat table which is constructed * from a series of XFormat records. * - * \sa tqparentStyle + * \sa parentStyle */ void setParentStyle( unsigned ps ); diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd index d9ab545b..04949083 100644 --- a/filters/kspread/gnumeric/gnumeric.xsd +++ b/filters/kspread/gnumeric/gnumeric.xsd @@ -801,7 +801,7 @@ <xsd:attribute name="ExprID" type="xsd:positiveInteger" use="optional"/> <!-- ValueType is not used if the cell contains an expression --> <xsd:attribute name="ValueType" type="gmr:cell_type" use="optional"/> - <!-- ValueFormat is aptqparently used only for cell-by-cell format + <!-- ValueFormat is apparently used only for cell-by-cell format overrides --> <xsd:attribute name="ValueFormat" type="xsd:string" use="optional"/> diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index 5089efa1..7bd198cc 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -128,7 +128,7 @@ support it.) <br>Jul 15, 2001 - Preliminary support for background patterns. <br>Aug 21, 2002 - text/number formats, border, patters, page/print info, comments <br>Aug 21, 2002 - font family, wrap text, number formating, precisions -<br>Sep 05, 2002 - bugfixes, default sizes, row and column tqlayouts +<br>Sep 05, 2002 - bugfixes, default sizes, row and column layouts <br>Sep 07, 2002 - bugfixes, preliminery date/time support <br>Feb 03, 2005 - export area name <br>Feb 06, 2005 - cells merged diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index 0c92ae60..df5dcc90 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -301,7 +301,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index 043e3ce6..d9d28d55 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -237,7 +237,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 677329da..8c3835ed 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -659,7 +659,7 @@ <slot>addLanguage()</slot> <slot>removeLanguage()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 1f8e6b50..5316749e 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -972,7 +972,7 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table ) /* * TODO: Test: do we need to copy the cells, too? - * if so we will probably also need to copy them for repeated col tqlayouts. + * if so we will probably also need to copy them for repeated col layouts. for ( j = 1; j <= columns; ++j ) { Cell* cell = table->cellAt( j, backupRow ); diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html index e2d667ad..dfaed8a4 100644 --- a/filters/kspread/opencalc/status.html +++ b/filters/kspread/opencalc/status.html @@ -47,10 +47,10 @@ KOffice filters status: OpenOffice.org Calc</h1></center> Links (e-mail, files, web)<br> cell content<br> Datatypes: float, percentage, (date), times, booleans (miss some kspread support) <br> - Formating: indents, bold, italic, tqalignments, colors...<br> + Formating: indents, bold, italic, alignments, colors...<br> Borders, background colors<br> column width, row width<br> - column tqlayouts, row tqlayouts<br> + column layouts, row layouts<br> page tqlayout (size, border)<br> OpenCalc style import, default style<br> format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br> |