From 039393e199a49b5158929668908f9cb1fe226484 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 24 Dec 2011 11:36:24 -0600 Subject: Rename a few stragglers --- kexi/doc/handbook/html.tmp/05_01_00_table_designing.html | 2 +- kexi/doc/handbook/html.tmp/05_04_00_form_designing.html | 6 +++--- kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py | 2 +- kexi/widget/tableview/kexitableview.cpp | 8 ++++---- kexi/widget/tableview/kexitableviewheader.cpp | 2 +- kexi/widget/utils/kexidisplayutils.cpp | 4 ++-- kexi/widget/utils/kexirecordmarker.cpp | 2 +- kivio/kiviopart/stencilbarbutton.cpp | 6 +++--- kspread/kspread_view.cc | 2 +- kword/KWFrameSet.cpp | 2 +- kword/KWViewMode.cpp | 2 +- lib/kofficeui/KoTemplateCreateDia.cpp | 2 +- lib/koproperty/editoritem.cpp | 2 +- lib/kotext/KoTextView.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html index 2953a0f0..14c0b511 100644 --- a/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html +++ b/kexi/doc/handbook/html.tmp/05_01_00_table_designing.html @@ -2,7 +2,7 @@

5.1. Designing Database Tables

-First, there will be two tables added to your database: persons and phone_numbers. These are exactly the same tables as described in chapter 1.2. A database and a spreadsheet. A tqlayout for Persons can be found in section Data integrity and validity in that chapter. +First, there will be two tables added to your database: persons and phone_numbers. These are exactly the same tables as described in chapter 1.2. A database and a spreadsheet. A layout for Persons can be found in section Data integrity and validity in that chapter.

diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html index 5df680c8..9cb671d1 100644 --- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html +++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html @@ -196,7 +196,7 @@ It is right moment for testing your form. Click the Label widget is used.

-Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left tqlayout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: Name, Surname and Street. Additionally, on the top of the form insert another label displaying name of the form, i.e. "Persons". Enlarge this label's size and set larger font using Format -> Font menu command. +Insert three text label widgets onto the form, placing them on the left hand of the text fields (or on the right hand if your operating system uses right-to-left layout). On inserting every new label, a text cursor appears inside where you can enter desired title. Enter consecutively: Name, Surname and Street. Additionally, on the top of the form insert another label displaying name of the form, i.e. "Persons". Enlarge this label's size and set larger font using Format -> Font menu command.


@@ -267,8 +267,8 @@ Using layout in this form improves alignment. Moreover, its space is better deve

There are two methods to create widget layout.

In each of these cases you can also use Format -> Layout Widgets menu.

diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py index d0d1f0cc..cace0340 100644 --- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py +++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py @@ -131,7 +131,7 @@ class HtmlExporter: if items == None: break output.write("") for item in items: - u = tqunicode(str(self.htmlescape(item)),"latin-1") + u = unicode(str(self.htmlescape(item)),"latin-1") output.write("%s" % u.encode("utf-8")) output.write("\n") output.write("\n") diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index da1c2f20..f5e3a376 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -240,14 +240,14 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // Create headers m_horizontalHeader = new KexiTableViewHeader(this, "topHeader"); - m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); m_horizontalHeader->setOrientation(Qt::Horizontal); m_horizontalHeader->setTracking(false); m_horizontalHeader->setMovingEnabled(false); connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int))); m_verticalHeader = new KexiRecordMarker(this, "rm"); - m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() ); m_verticalHeader->setCellHeight(d->rowHeight); // m_verticalHeader->setFixedWidth(d->rowHeight); m_verticalHeader->setCurrentRow(-1); @@ -2508,9 +2508,9 @@ void KexiTableView::paletteChange( const TQPalette &oldPalette ) Q_UNUSED(oldPalette); //update: if (m_verticalHeader) - m_verticalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() ); if (m_horizontalHeader) - m_horizontalHeader->setSelectionBackgroundColor( tqpalette().active().highlight() ); + m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); } const KexiTableView::Appearance& KexiTableView::appearance() const diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index cab7f791..d4b64127 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -61,7 +61,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) : TQHeader(parent, name) , m_lastToolTipSection(-1) - , m_selectionBackgroundColor(tqApp->tqpalette().active().highlight()) + , m_selectionBackgroundColor(tqApp->palette().active().highlight()) , m_selectedSection(-1) , m_styleChangeEnabled(true) { diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp index 0866cf65..11b1d742 100644 --- a/kexi/widget/utils/kexidisplayutils.cpp +++ b/kexi/widget/utils/kexidisplayutils.cpp @@ -93,7 +93,7 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters() KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w) { textColor = w->palette().active().foreground(); - selectedTextColor = w->tqpalette().active().highlightedText(); + selectedTextColor = w->palette().active().highlightedText(); font = w->font(); } @@ -113,7 +113,7 @@ void KexiDisplayUtils::initDisplayForAutonumberSign(DisplayParameters& par, TQWi void KexiDisplayUtils::initDisplayForDefaultValue(DisplayParameters& par, TQWidget *widget) { par.textColor = SPECIAL_TEXT_COLOR; - par.selectedTextColor = widget->tqpalette().active().highlightedText(); + par.selectedTextColor = widget->palette().active().highlightedText(); par.font = widget->font(); par.font.setItalic(true); } diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index a2d6b3d6..ff97d21a 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -100,7 +100,7 @@ public: , highlightedRow(-1) , editRow(-1) , rows(0) - , selectionBackgroundColor(tqApp->tqpalette().active().highlight()) + , selectionBackgroundColor(tqApp->palette().active().highlight()) , showInsertRow(true) { } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index 39fb22ef..bb9b5627 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -122,7 +122,7 @@ void DragBarButton::drawButton( TQPainter* paint ) TQPainter pixPainter(&pix); const TQColorGroup& g = colorGroup(); - tqstyle().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() ); + style().drawControl( TQStyle::CE_PushButton, &pixPainter, this, TQRect(0, 0, pixSize.width(), pixSize.height()), colorGroup() ); int m = 3; int tw = 0; @@ -130,7 +130,7 @@ void DragBarButton::drawButton( TQPainter* paint ) if ( m_pIcon ) { pw = m_pIcon->width(); - tqstyle().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ), + style().drawItem( &pixPainter, TQRect( m, 0, pw, pixSize.height() ), AlignLeft | AlignVCenter, colorGroup(), isEnabled(), m_pIcon, TQString(), -1, @@ -144,7 +144,7 @@ void DragBarButton::drawButton( TQPainter* paint ) int x = m + pw + (tw!=0 && pw!=0 ?m:0); TQString t = KStringHandler::rPixelSqueeze(text(), fm, pixSize.width() - (x + m + 22)); - tqstyle().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ), + style().drawItem( &pixPainter, TQRect( x, 0, tw, pixSize.height() ), AlignLeft | AlignVCenter|ShowPrefix, colorGroup(), isEnabled(), 0L, t, -1, diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index 02bd1407..f32444c0 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -7537,7 +7537,7 @@ void View::runInspector() TQColor View::highlightColor() { - return TQApplication::tqpalette().active().highlight().light( 175 ); + return TQApplication::palette().active().highlight().light( 175 ); } } // namespace KSpread diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index ec5cf7db..515b0df0 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -789,7 +789,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc doubleBufPainter->begin( pix ); // Initialize the pixmap to the page background color // (if the frame is over the page margins, no underlying frame will paint anything there) - doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::tqpalette().active().brush( TQColorGroup::Base ) ); + doubleBufPainter->fillRect( 0, 0, outerCRect.width(), outerCRect.height(), TQApplication::palette().active().brush( TQColorGroup::Base ) ); // The double-buffer pixmap has (0,0) at outerCRect.topLeft(), so we need to // translate the double-buffer painter; drawFrameAndBorders will draw using view coordinates. diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp index aba5d83c..b8249839 100644 --- a/kword/KWViewMode.cpp +++ b/kword/KWViewMode.cpp @@ -579,7 +579,7 @@ void KWViewModeText::setPageLayout( KoRuler* hRuler, KoRuler* vRuler, const KoPa layout.orientation = PG_PORTRAIT; TQSize cSize = contentsSize(); layout.ptWidth = m_doc->unzoomItX( cSize.width() ); - tqlayout.ptHeight = m_doc->unzoomItY( cSize.height() ); + layout.ptHeight = m_doc->unzoomItY( cSize.height() ); //kdDebug() << "KWViewModeText::setPageLayout layout size " << layout.ptWidth << "x" << layout.ptHeight << endl; layout.ptLeft = OFFSET; layout.ptRight = 0; diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index d2dc25f0..91684726 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -144,7 +144,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan rightbox->addWidget(pixbox); TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(), KDialogBase::spacingHint()); - pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2); + pixlayout->addSpacing(pixbox->fontMetrics().height()/2); pixlayout->addStretch(1); d->m_default=new TQRadioButton(i18n("&Default"), pixbox); d->m_default->setChecked(true); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 1027d224..b378f93a 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -135,7 +135,7 @@ class GroupWidgetBase : public TQWidget TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default; kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags); - paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen()); + paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen()); if (!m_miniicon.isNull()) { p.drawPixmap(24, (r.height()-m_miniicon.height())/2, m_miniicon); } diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 9733e123..cb8116c9 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -611,7 +611,7 @@ KoTextCursor KoTextView::selectWordUnderCursor( const KoTextCursor& cursor, int const bool isWordDelimiter = ch.isSpace() || ch.category() == TQChar::Punctuation_Open // e.g. '(' || ch.category() == TQChar::Punctuation_Close // e.g. ')' - || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/tqunicode/category/Po/list.htm + || ch.category() == TQChar::Punctuation_Other // see http://www.fileformat.info/info/unicode/category/Po/list.htm ; if( !beginFound && !isWordDelimiter ) -- cgit v1.2.3