TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 3

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/54/head
Michele Calgaro 1 year ago
parent 10a82ab583
commit dcc4dc7a89
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
30 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File

4
chalk/core/kis_boundary.cpp
Unescape View File

@ -52,7 +52,7 @@ void KisBoundary::generateBoundary(int w, int h) {
darkBot = cs->getAlpha(botIt.rawData());
if (darkTop != darkBot) {
// detected a change
m_horSegments.back().append(tqMakePair(KisPoint(botIt.x(), botIt.y()), 1));
m_horSegments.back().append(qMakePair(KisPoint(botIt.x(), botIt.y()), 1));
}
++topIt;
++botIt;
@ -73,7 +73,7 @@ void KisBoundary::generateBoundary(int w, int h) {
darkRight = cs->getAlpha(rightIt.rawData());
if (darkLeft != darkRight) {
// detected a change
m_vertSegments.back().append(tqMakePair(KisPoint(rightIt.x(), rightIt.y()), 1));
m_vertSegments.back().append(qMakePair(KisPoint(rightIt.x(), rightIt.y()), 1));
}
++leftIt;
++rightIt;

2
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
Unescape View File

@ -161,7 +161,7 @@ void RegionGrabber::drawRubber()
p.setPen( TQPen( color0, 1 ) );
p.setBrush( NoBrush );
style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
p.end();

4
chalk/ui/kis_color_cup.cpp
Unescape View File

@ -83,7 +83,7 @@ void KisColorCup::slotClicked()
TQSize KisColorCup::sizeHint() const
{
return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
expandedTo(TQApplication::globalStrut());
}
@ -110,7 +110,7 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
if ( hasFocus() ) {
TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}

2
chalk/ui/squeezedcombobox.cpp
Unescape View File

@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const
int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
return style().sizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).
expandedTo(TQApplication::globalStrut());
}

4
filters/kspread/gnumeric/gnumericimport.cpp
Unescape View File

@ -915,7 +915,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table
{
Range range(repeate);
//kdDebug()<<" repeate :"<<repeate<<"range. ::start row : "<<range.startRow ()<<" start col :"<<range.startCol ()<<" end row :"<<range.endRow ()<<" end col :"<<range.endCol ()<<endl;
table->print()->setPrintRepeatRows( tqMakePair( range.startRow (),range.endRow ()) );
table->print()->setPrintRepeatRows( qMakePair( range.startRow (),range.endRow ()) );
}
}
@ -929,7 +929,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table
repeate = repeate.replace( "65536", "32500" );
Range range(repeate);
//kdDebug()<<" repeate :"<<repeate<<"range. ::start row : "<<range.startRow ()<<" start col :"<<range.startCol ()<<" end row :"<<range.endRow ()<<" end col :"<<range.endCol ()<<endl;
table->print()->setPrintRepeatColumns( tqMakePair( range.startCol (),range.endCol ()) );
table->print()->setPrintRepeatColumns( qMakePair( range.startCol (),range.endCol ()) );
}
}

10
filters/kword/oowriter/conversion.cpp
Unescape View File

@ -30,20 +30,20 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap )
{
if ( oowrap == "none" )
// 'no wrap' means 'avoid horizontal space'
return tqMakePair( 2, TQString() );
return qMakePair( 2, TQString() );
if ( oowrap == "left" || oowrap == "right" )
// Left and right, no problem
return tqMakePair( 1, oowrap );
return qMakePair( 1, oowrap );
if ( oowrap == "run-through" )
return tqMakePair( 0, TQString() );
return qMakePair( 0, TQString() );
if ( oowrap == "biggest" ) // OASIS extension
return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
return qMakePair( 1, TQString::fromLatin1( "biggest" ) );
////if ( oowrap == "parallel" || oowrap == "dynamic" )
// dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel.
// Those are not supported in KWord, let's use biggest instead
return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
return qMakePair( 1, TQString::fromLatin1( "biggest" ) );
}
TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs )

4
filters/kword/pdf/dialog.cpp
Unescape View File

@ -48,12 +48,12 @@ SelectionRange::SelectionRange(const TQString &s)
for (TQStringList::iterator it = list.begin(); it!=list.end(); ++it) {
if ( one.exactMatch(*it) ) {
uint p = (*it).toUInt();
r.push_back( tqMakePair(p, p) );
r.push_back( qMakePair(p, p) );
} else if ( range.exactMatch(*it) ) {
uint p1 = range.cap(1).toUInt();
uint p2 = range.cap(2).toUInt();
if ( p1>p2 ) continue;
r.push_back( tqMakePair(p1, p2) );
r.push_back( qMakePair(p1, p2) );
}
}

4
kchart/kchartBackgroundPixmapConfigPage.cpp
Unescape View File

@ -213,7 +213,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
canLoadScaleable = true;
#endif
if ( fileConfig.readEntry("ImageType") == "pixmap" || canLoadScaleable ) {
papers[lrs] = tqMakePair(rs, directory + fileName);
papers[lrs] = qMakePair(rs, directory + fileName);
files.append(directory + fileName);
}
}
@ -254,7 +254,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
rs = imageCaption + " (" + TQString::number(n) + ')';
lrs = rs.lower();
}
papers[lrs] = tqMakePair(rs, *it);
papers[lrs] = qMakePair(rs, *it);
}
}

4
kdgantt/KDGanttMinimizeSplitter.cpp
Unescape View File

@ -243,7 +243,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
p.setBrush( colorGroup().background() );
p.setPen( colorGroup().foreground() );
p.drawRect( rect() );
parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
parentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
parentWidget()->colorGroup());
int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
{
style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
(orientation() == TQt::Horizontal ?
TQStyle::Style_Horizontal : 0));
}

12
kexi/kexiutils/styleproxy.h
Unescape View File

@ -87,14 +87,14 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option );
}
virtual void drawControl( TQ_ControlElement element,
virtual void drawControl( ControlElement element,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget );
}
virtual void drawControlMask( TQ_ControlElement element,
virtual void drawControlMask( ControlElement element,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
@ -106,7 +106,7 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
return m_style->subRect( r, ceData, elementFlags, widget );
}
virtual void drawComplexControl( TQ_ComplexControl control,
virtual void drawComplexControl( ComplexControl control,
TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags how = Style_Default,
#ifdef TQ_TQDOC
@ -119,21 +119,21 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
drawComplexControl( control, p, ceData, elementFlags, r, cg, how, sub, subActive, option, widget );
}
virtual void drawComplexControlMask( TQ_ComplexControl control,
virtual void drawComplexControlMask( ComplexControl control,
TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget );
}
virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
virtual TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{
return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget );
}
virtual SubControl querySubControl( TQ_ComplexControl control,
virtual SubControl querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{

4
kexi/main/startup/KexiStartupFileDialog_win.cpp
Unescape View File

@ -105,11 +105,11 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
//TODO true );
//TODO d->completionLock = false;
//TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
//TODO TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
//TODO toolbar = 0; //(js)
//(js) toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
//(js) toolbar->setFlat(true);
//TODO tqInstallMsgHandler( oldHandler );
//TODO qInstallMsgHandler( oldHandler );
//(js) d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
//(js) toolbar, "path combo" );

4
kexi/plugins/forms/widgets/kexidbcombobox.cpp
Unescape View File

@ -161,7 +161,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
style().drawPrimitive( TQStyle::PE_FocusRect, &p,
r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
}
//todo
@ -508,7 +508,7 @@ TQSize KexiDBComboBox::sizeHint() const
const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;

2
kexi/plugins/forms/widgets/kexidbimagebox.cpp
Unescape View File

@ -685,7 +685,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
// if the widget is focused, draw focus indicator rect _if_ there is no chooser button
if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
style().tqdrawPrimitive(
style().drawPrimitive(
TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this),
palette().active() );
}

2
kexi/widget/kexismalltoolbutton.cpp
Unescape View File

@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
TQRect(width()-7, height()-7, 5, 5), colorGroup(),
arrowFlags, TQStyleOption() );
}

6
kexi/widget/pixmapcollection.cpp
Unescape View File

@ -60,7 +60,7 @@ PixmapCollection::addPixmapPath(const KURL &url)
name += "2";
}
m_pixmaps.insert(name, tqMakePair(url.path(), 0));
m_pixmaps.insert(name, qMakePair(url.path(), 0));
return name;
}
@ -78,7 +78,7 @@ PixmapCollection::addPixmapName(const TQString &icon, int size)
name += "2";
}
m_pixmaps.insert(name, tqMakePair(icon, size));
m_pixmaps.insert(name, qMakePair(icon, size));
return name;
}
@ -144,7 +144,7 @@ PixmapCollection::load(TQDomNode node)
for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling())
{
TQDomElement el = n.toElement();
TQPair<TQString, int> pair = tqMakePair(el.text(), el.attribute("size").toInt());
TQPair<TQString, int> pair = qMakePair(el.text(), el.attribute("size").toInt());
m_pixmaps[el.attribute("name")] = pair;
}
}

2
kexi/widget/relations/kexirelationviewtable.cpp
Unescape View File

@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
{
if (painter) {
style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
style().drawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
TQStyle::Style_FocusAtBorder);
}
return itemRect(item);

2
kexi/widget/utils/kexicomboboxdropdownbutton.cpp
Unescape View File

@ -64,7 +64,7 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
}
else {
r.setWidth(r.width()+2);
style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
style().drawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
}
}

2
kexi/widget/utils/kexidropdownbutton.cpp
Unescape View File

@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
style().drawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}

2
kexi/widget/utils/kexirecordmarker.cpp
Unescape View File

@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
int y = ((d->rowHeight * i)-d->offset);
TQRect r(0, y, width(), d->rowHeight);
p.drawRect(r);
style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
style().drawPrimitive( TQStyle::PE_HeaderSection, &p, r,
(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()),
TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
}

4
kplato/kptcalendarpanel.cpp
Unescape View File

@ -174,7 +174,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*)
// ----- calculate size of the month button:
for(count=0; count<NoOfButtons; ++count) {
if(buttons[count]==selectMonth) {
TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin)));
}
}
@ -432,7 +432,7 @@ CalendarPanel::sizeHint() const
sizes[count] = TQSize(0,0);
if(buttons[count]==selectMonth) {
TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::style().pixelMetric(TQStyle::PM_ButtonMargin));
} else {
cx+=sizes[count].width();

10
kplato/kptwbsdefinition.cpp
Unescape View File

@ -37,11 +37,11 @@ WBSDefinition::WBSDefinition() {
m_defaultDef.code = "Number";
m_defaultDef.separator = ".";
m_codeLists.append(tqMakePair(TQString("Number"), i18n("Number")));
m_codeLists.append(tqMakePair(TQString("Roman, upper case"), i18n("Roman, Upper Case")));
m_codeLists.append(tqMakePair(TQString("Roman, lower case"), i18n("Roman, Lower Case")));
m_codeLists.append(tqMakePair(TQString("Letter, upper case"), i18n("Letter, Upper Case")));
m_codeLists.append(tqMakePair(TQString("Letter, lower case"), i18n("Letter, Lower Case")));
m_codeLists.append(qMakePair(TQString("Number"), i18n("Number")));
m_codeLists.append(qMakePair(TQString("Roman, upper case"), i18n("Roman, Upper Case")));
m_codeLists.append(qMakePair(TQString("Roman, lower case"), i18n("Roman, Lower Case")));
m_codeLists.append(qMakePair(TQString("Letter, upper case"), i18n("Letter, Upper Case")));
m_codeLists.append(qMakePair(TQString("Letter, lower case"), i18n("Letter, Lower Case")));
}
WBSDefinition::~WBSDefinition() {

8
kspread/dialogs/kspread_dlg_paperlayout.cpp
Unescape View File

@ -354,7 +354,7 @@ void PaperLayout::slotOk()
if ( tmpRepeatCols.isEmpty() )
{
print->setPrintRepeatColumns( tqMakePair( 0, 0 ) );
print->setPrintRepeatColumns( qMakePair( 0, 0 ) );
}
else
{
@ -369,7 +369,7 @@ void PaperLayout::slotOk()
if ( col2 > 0 && col2 <= KS_colMax )
{
error = false;
print->setPrintRepeatColumns ( tqMakePair( col1, col2 ) );
print->setPrintRepeatColumns ( qMakePair( col1, col2 ) );
}
}
}
@ -380,7 +380,7 @@ void PaperLayout::slotOk()
if ( tmpRepeatRows.isEmpty() )
{
print->setPrintRepeatRows ( tqMakePair( 0, 0 ) );
print->setPrintRepeatRows ( qMakePair( 0, 0 ) );
}
else
{
@ -395,7 +395,7 @@ void PaperLayout::slotOk()
if ( row2 > 0 && row2 <= KS_rowMax )
{
error = false;
print->setPrintRepeatRows ( tqMakePair( row1, row2 ) );
print->setPrintRepeatRows ( qMakePair( row1, row2 ) );
}
}
}

4
kspread/kspread_sheet.cpp
Unescape View File

@ -7941,7 +7941,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
{
int left = printrepeatcolumns.attribute( "left" ).toInt();
int right = printrepeatcolumns.attribute( "right" ).toInt();
d->print->setPrintRepeatColumns( tqMakePair( left, right ) );
d->print->setPrintRepeatColumns( qMakePair( left, right ) );
}
// load print repeat rows
@ -7950,7 +7950,7 @@ bool Sheet::loadXML( const TQDomElement& sheet )
{
int top = printrepeatrows.attribute( "top" ).toInt();
int bottom = printrepeatrows.attribute( "bottom" ).toInt();
d->print->setPrintRepeatRows( tqMakePair( top, bottom ) );
d->print->setPrintRepeatRows( qMakePair( top, bottom ) );
}
if( !sheet.hasAttribute( "borders1.2" ) )

8
kspread/kspread_sheetprint.cpp
Unescape View File

@ -76,8 +76,8 @@ SheetPrint::SheetPrint( Sheet* sheet )
m_maxCheckedNewPageY = 1;
m_dPrintRepeatColumnsWidth = 0.0;
m_dPrintRepeatRowsHeight = 0.0;
m_printRepeatColumns = tqMakePair( 0, 0 );
m_printRepeatRows = tqMakePair( 0, 0 );
m_printRepeatColumns = qMakePair( 0, 0 );
m_printRepeatRows = qMakePair( 0, 0 );
m_dZoom = 1.0;
m_iPageLimitX = 0;
m_iPageLimitY = 0;
@ -1734,7 +1734,7 @@ void SheetPrint::removeColumn( int col, int nbCol )
//Validity checks
if ( left < 1 ) left = 1;
if ( right < 1 ) right = 1;
setPrintRepeatColumns ( tqMakePair( left, right ) );
setPrintRepeatColumns ( qMakePair( left, right ) );
}
}
@ -1772,7 +1772,7 @@ void SheetPrint::removeRow( int row, int nbRow )
//Validity checks
if ( top < 1 ) top = 1;
if ( bottom < 1 ) bottom = 1;
setPrintRepeatRows( tqMakePair( top, bottom ) );
setPrintRepeatRows( qMakePair( top, bottom ) );
}
}

2
kword/TODO
Unescape View File

@ -14,7 +14,7 @@ and then kotextformatter needs to move down by that height if .... hmm done.
Differences with OO that ought to be fixed:
-------------------------------------------
- space above and below paragraphs is QMAX()ed indeed, like QRichText originally did.
- space above and below paragraphs is TQMAX()ed indeed, like QRichText originally did.
- offsetFromBaseline should be a % (of the font size) instead of an absolute pt value,
even in the GUI (which currently limits to +/- 9pt).

6
lib/kofficeui/KoTooluButton.cpp
Unescape View File

@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
// The "active" element (if there is one)
if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 &&
mapFromPosition( m_focusPosition ).intersects( e->rect() ) )
style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
--lns; // Attention: We just avoid some lns - 1 statements
@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition );
if ( it != m_colorMap.end() ) {
// draw at the new focus position
style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() );
}
@ -720,7 +720,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
_painter->setClipping( false );
// ...and the arrow indicating the popup
style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
style().drawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
cg, flags, opt );
if ( TDEToolBarButton::isRaised() || m_arrowPressed )

2
lib/kofficeui/tkcombobox.cpp
Unescape View File

@ -91,7 +91,7 @@ void TKComboBox::paintEvent(TQPaintEvent*)
style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
if ( hasFocus()) {
style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
style().drawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
}
if (!editable()) {

2
lib/koproperty/editoritem.cpp
Unescape View File

@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget
TQRect r(rect());
TQPainter p(this);
TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
if (!m_miniicon.isNull()) {

4
lib/kotext/KoTextFormatter.cpp
Unescape View File

@ -118,7 +118,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
}
Q_ASSERT( ww >= 0 );
c->width = ww;
return tqMakePair(ww, pixelww);
return qMakePair(ww, pixelww);
}
@ -257,7 +257,7 @@ bool KoTextFormatterCore::format()
int col = 0;
maxAvailableWidth = tqMakePair( 0, 0 );
maxAvailableWidth = qMakePair( 0, 0 );
KoTextZoomHandler *zh = doc->formattingZoomHandler();
int pixelx = zh->layoutUnitToPixelX( x );

14
lib/kotext/KoTextIterator.cpp
Unescape View File

@ -306,19 +306,19 @@ TQPair<int, TQString> KoTextIterator::currentTextAndIndex() const
if ( m_currentParag == m_firstParag )
{
if ( m_firstParag == m_lastParag ) // special case, needs truncating at both ends
return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) )
: tqMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) );
return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) )
: qMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) );
else
return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex ) )
: tqMakePair( 0, str.left( m_firstIndex ) );
return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex ) )
: qMakePair( 0, str.left( m_firstIndex ) );
}
if ( m_currentParag == m_lastParag )
{
return forw ? tqMakePair( 0, str.left( m_lastIndex ) )
: tqMakePair( m_lastIndex, str.mid( m_lastIndex ) );
return forw ? qMakePair( 0, str.left( m_lastIndex ) )
: qMakePair( m_lastIndex, str.mid( m_lastIndex ) );
}
// Not the first parag, nor the last, so we return it all
return tqMakePair( 0, str );
return qMakePair( 0, str );
}
bool KoTextIterator::hasText() const

Write Preview
Loading…
Cancel
Save