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 +-
7 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'kexi')
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.
-- Select two or more widgets that should be placed in a common tqlayout, and select one of the tqlayout types from the context menu item Layout Widgets.
-- Click a container widget (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item Layout Widgets. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.
+- Select two or more widgets that should be placed in a common layout, and select one of the layout types from the context menu item Layout Widgets.
+- Click a container widget (or a form surface itself), where widgets are inserted and select one of the layout types from the context menu item Layout Widgets. All widgets existing within the container or within the form, being on the same level will be put into a single common 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)
{
}
--
cgit v1.2.1