summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:05:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:05:41 -0600
commit2d6954f69caf63ed5057bd8e1405a65d7d970292 (patch)
tree88e6436b2e81d4e68313f02a9021054252e14cc4 /kexi
parentf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (diff)
downloadkoffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.tar.gz
koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.zip
Rename obsolete tq methods to standard names
Diffstat (limited to 'kexi')
-rw-r--r--kexi/3rdparty/kexisql/src/os.c10
-rw-r--r--kexi/3rdparty/kexisql3/src/main.c2
-rw-r--r--kexi/3rdparty/kexisql3/src/os_mac.c10
-rw-r--r--kexi/3rdparty/kexisql3/src/os_win.c6
-rw-r--r--kexi/3rdparty/kexisql3/src/prepare.c2
-rw-r--r--kexi/3rdparty/kexisql3/src/utf.c14
-rw-r--r--kexi/3rdparty/kexisql3/src/vdbeInt.h2
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp10
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutColumns.h10
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui4
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutSize.cpp6
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutSize.h8
-rw-r--r--kexi/3rdparty/kolibs/koPageLayout.cpp26
-rw-r--r--kexi/3rdparty/kolibs/koPageLayout.h8
-rw-r--r--kexi/3rdparty/kolibs/koPageLayoutDia.cc80
-rw-r--r--kexi/3rdparty/kolibs/koPageLayoutDia.h26
-rw-r--r--kexi/3rdparty/kolibs/koUnitWidgets.cc20
-rw-r--r--kexi/doc/common/kde-default.css4
-rw-r--r--kexi/doc/common/kde-web.css4
-rw-r--r--kexi/doc/dev/kexi_guidelines.txt2
-rw-r--r--kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html2
-rw-r--r--kexi/doc/handbook/html.tmp/05_04_00_form_designing.html58
-rw-r--r--kexi/doc/handbook/translation-status.txt2
-rw-r--r--kexi/formeditor/commands.cpp20
-rw-r--r--kexi/formeditor/commands.h4
-rw-r--r--kexi/formeditor/connectiondialog.cpp12
-rw-r--r--kexi/formeditor/container.cpp24
-rw-r--r--kexi/formeditor/container.h16
-rw-r--r--kexi/formeditor/editlistviewdialog.cpp18
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp6
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp12
-rw-r--r--kexi/formeditor/form.cpp2
-rw-r--r--kexi/formeditor/form.h6
-rw-r--r--kexi/formeditor/formIO.cpp108
-rw-r--r--kexi/formeditor/formmanager.cpp18
-rw-r--r--kexi/formeditor/formmanager.h14
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/formeditor/widgetlibrary.cpp2
-rw-r--r--kexi/formeditor/widgetpropertyset.cpp24
-rw-r--r--kexi/formeditor/widgetpropertyset.h4
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqldriver.cpp4
-rw-r--r--kexi/kexidb/drivers/sqlite/sqliteconnection.cpp2
-rw-r--r--kexi/kexiutils/identifier.cpp4
-rw-r--r--kexi/kexiutils/transliteration_table.h2
-rw-r--r--kexi/kexiutils/utils.cpp6
-rw-r--r--kexi/kexiutils/utils.h2
-rw-r--r--kexi/main/kexifinddialog.cpp4
-rw-r--r--kexi/main/keximainwindowimpl.cpp6
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetupbase.ui6
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp10
-rw-r--r--kexi/main/startup/KexiDBTitlePage.h2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp4
-rw-r--r--kexi/main/startup/KexiOpenExistingFile.ui2
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp4
-rw-r--r--kexi/migration/importwizard.cpp6
-rw-r--r--kexi/plugins/forms/kexiactionselectiondialog.cpp4
-rw-r--r--kexi/plugins/forms/kexidbfactory.cpp2
-rw-r--r--kexi/plugins/forms/kexidbtextwidgetinterface.cpp2
-rw-r--r--kexi/plugins/forms/kexiformview.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbautofield.cpp36
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp18
-rw-r--r--kexi/plugins/forms/widgets/kexidbdateedit.cpp6
-rw-r--r--kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp10
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp12
-rw-r--r--kexi/plugins/forms/widgets/kexidblabel.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexiframe.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexport.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexportwizard.cpp10
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexportwizard.h2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp12
-rw-r--r--kexi/plugins/importexport/csv/kexicsvwidgets.h2
-rw-r--r--kexi/plugins/macros/kexipart/keximacrodesignview.cpp4
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerrorbase.ui6
-rw-r--r--kexi/plugins/macros/kexipart/keximacroproperty.cpp6
-rw-r--r--kexi/plugins/macros/kexipart/keximacrotextview.cpp4
-rw-r--r--kexi/plugins/queries/kexiaddparamwidget.ui8
-rw-r--r--kexi/plugins/queries/kexiparameterlisteditor.ui2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.h4
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp6
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp2
-rw-r--r--kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp2
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp4
-rw-r--r--kexi/plugins/scripting/scripts/copycenter/CopyCenter.py32
-rw-r--r--kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py6
-rwxr-xr-xkexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py4
-rw-r--r--kexi/tests/altertable/altertable.cpp6
-rw-r--r--kexi/tests/gui/finddialog/kexifinddialogbase.ui2
-rw-r--r--kexi/widget/kexidbconnectionwidget.cpp2
-rw-r--r--kexi/widget/kexidbconnectionwidgetbase.ui4
-rw-r--r--kexi/widget/kexidbconnectionwidgetdetailsbase.ui6
-rw-r--r--kexi/widget/kexieditor.cpp10
-rw-r--r--kexi/widget/kexiscrollview.cpp4
-rw-r--r--kexi/widget/kexisectionheader.cpp4
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp4
-rw-r--r--kexi/widget/pixmapcollection.cpp10
-rw-r--r--kexi/widget/relations/kexirelationviewconnection.cpp2
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexibooltableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexicomboboxtableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexitableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.h2
-rw-r--r--kexi/widget/tableview/kexitableviewdata.cpp12
-rw-r--r--kexi/widget/tableview/kexitableviewheader.cpp16
-rw-r--r--kexi/widget/utils/kexiarrowtip.cpp4
-rw-r--r--kexi/widget/utils/kexicomboboxdropdownbutton.cpp14
-rw-r--r--kexi/widget/utils/kexidisplayutils.cpp2
-rw-r--r--kexi/widget/utils/kexidropdownbutton.cpp6
-rw-r--r--kexi/widget/utils/kexiflowlayout.cpp14
-rw-r--r--kexi/widget/utils/kexiflowlayout.h8
-rw-r--r--kexi/widget/utils/kexirecordmarker.cpp2
-rw-r--r--kexi/widget/utils/kexitooltip.cpp2
114 files changed, 521 insertions, 521 deletions
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index 79eb15e5..85872a5a 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite(
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrShPerm, &(id->refNum)) != noErr ){
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrPerm, &(id->refNum)) != noErr ){
- if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
else
@@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
# else
@@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
# else
diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c
index 1c1029f9..83356f43 100644
--- a/kexi/3rdparty/kexisql3/src/main.c
+++ b/kexi/3rdparty/kexisql3/src/main.c
@@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
** error.
*/
const void *sqlite3_errmsg16(sqlite3 *db){
- /* Because all the characters in the string are in the tqunicode
+ /* Because all the characters in the string are in the unicode
** range 0x00-0xFF, if we pad the big-endian string with a
** zero byte, we can obtain the little-endian string with
** &big_endian[1].
diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c
index f393b423..285d0805 100644
--- a/kexi/3rdparty/kexisql3/src/os_mac.c
+++ b/kexi/3rdparty/kexisql3/src/os_mac.c
@@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite(
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrShPerm, &(id->refNum)) != noErr ){
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrPerm, &(id->refNum)) != noErr ){
- if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
else
@@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdWrPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
# else
@@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
return SQLITE_CANTOPEN;
FSGetDataForkName(&dfName);
- if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+ if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
fsRdPerm, &(id->refNum)) != noErr )
return SQLITE_CANTOPEN;
# else
diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c
index 8c729136..2b0a00ec 100644
--- a/kexi/3rdparty/kexisql3/src/os_win.c
+++ b/kexi/3rdparty/kexisql3/src/os_win.c
@@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){
** Convert UTF-32 to UTF-8. Space to hold the returned string is
** obtained from sqliteMalloc().
*/
-static char *tqunicodeToUtf8(const WCHAR *zWideFilename){
+static char *unicodeToUtf8(const WCHAR *zWideFilename){
int nByte;
char *zFilename;
@@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){
char *zMulti;
WCHAR zWidePath[SQLITE_TEMPNAME_SIZE];
GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath);
- zMulti = tqunicodeToUtf8(zWidePath);
+ zMulti = unicodeToUtf8(zWidePath);
if( zMulti ){
strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30);
zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0;
@@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){
if( zTemp==0 ) return 0;
GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW);
sqliteFree(zWide);
- zFull = tqunicodeToUtf8(zTemp);
+ zFull = unicodeToUtf8(zTemp);
sqliteFree(zTemp);
}else{
nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c
index 23bfa533..a0c7be87 100644
--- a/kexi/3rdparty/kexisql3/src/prepare.c
+++ b/kexi/3rdparty/kexisql3/src/prepare.c
@@ -527,7 +527,7 @@ int sqlite3_prepare16(
if( zTail8 && pzTail ){
/* If sqlite3_prepare returns a tail pointer, we calculate the
- ** equivalent pointer into the UTF-16 string by counting the tqunicode
+ ** equivalent pointer into the UTF-16 string by counting the unicode
** characters between zSql8 and zTail8, and then returning a pointer
** the same number of characters into the UTF-16 string.
*/
diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c
index 5efbfe78..d42ab759 100644
--- a/kexi/3rdparty/kexisql3/src/utf.c
+++ b/kexi/3rdparty/kexisql3/src/utf.c
@@ -43,11 +43,11 @@
**
** When converting malformed UTF-8 strings to UTF-16, one instance of the
** replacement character U+FFFD for each byte that cannot be interpeted as
-** part of a valid tqunicode character.
+** part of a valid unicode character.
**
** When converting malformed UTF-16 strings to UTF-8, one instance of the
** replacement character U+FFFD for each pair of bytes that cannot be
-** interpeted as part of a valid tqunicode character.
+** interpeted as part of a valid unicode character.
**
** This file contains the following public routines:
**
@@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){
#endif /* SQLITE_OMIT_UTF16 */
/*
-** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero,
-** return the number of tqunicode characters in pZ up to (but not including)
+** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
+** return the number of unicode characters in pZ up to (but not including)
** the first 0x00 byte. If nByte is not less than zero, return the
-** number of tqunicode characters in the first nByte of pZ (or up to
+** number of unicode characters in the first nByte of pZ (or up to
** the first 0x00, whichever comes first).
*/
int sqlite3utf8CharLen(const char *z, int nByte){
@@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){
#ifndef SQLITE_OMIT_UTF16
/*
-** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero,
+** pZ is a UTF-16 encoded unicode string. If nChar is less than zero,
** return the number of bytes up to (but not including), the first pair
** of consecutive 0x00 bytes in pZ. If nChar is not less than zero,
-** then return the number of bytes in the first nChar tqunicode characters
+** then return the number of bytes in the first nChar unicode characters
** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
*/
int sqlite3utf16ByteLen(const void *zIn, int nChar){
diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h
index 89174271..4c732b09 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeInt.h
+++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h
@@ -133,7 +133,7 @@ typedef struct Mem Mem;
** No other flags may be set in this case.
**
** If the MEM_Str flag is set then Mem.z points at a string representation.
-** Usually this is encoded in the same tqunicode encoding as the main
+** Usually this is encoded in the same unicode encoding as the main
** database (see below for exceptions). If the MEM_Term flag is also
** set, then the string is nul terminated. The MEM_Int and MEM_Real
** flags may coexist with the MEM_Str flag.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 8ea3b0b9..2d1e6b77 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -25,18 +25,18 @@
#include <tqlabel.h>
#include <tqlayout.h>
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
: KoPageLayoutColumnsBase(parent) {
m_columns = columns;
TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
- m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
+ m_preview = new KoPagePreview( previewPane, "Preview", layout );
lay->addWidget(m_preview);
lay = new TQHBoxLayout(columnSpacingPane);
m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
m_spacing->setValue( m_columns.ptColumnSpacing );
m_spacing->setUnit( unit );
double dStep = KoUnit::fromUserValue( 0.2, unit );
- m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
+ m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
lay->addWidget(m_spacing);
labelSpacing->setBuddy( m_spacing );
nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
emit propertyChange(m_columns);
}
-void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
- m_preview->setPageLayout( tqlayout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
+ m_preview->setPageLayout( layout );
}
#include <KoPageLayoutColumns.moc>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 8ebac1b2..b9dcd6c2 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
* @param parent the parent widget
* @param columns the KoColumns data structure that this dialog should be initialzed with
* @param unit the unit-type (mm/cm/inch) that the dialog should show
- * @param tqlayout the page tqlayout that the preview should be initialzed with.
+ * @param layout the page layout that the preview should be initialzed with.
*/
- KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+ KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
/**
- * Update the page preview widget with the param tqlayout.
- * @param tqlayout the new tqlayout
+ * Update the page preview widget with the param layout.
+ * @param layout the new layout
*/
- void setLayout(KoPageLayout &tqlayout);
+ void setLayout(KoPageLayout &layout);
public slots:
/**
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index 41246d84..7f36378e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index a1f65a90..26960701 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -33,9 +33,9 @@
#include <tqvgroupbox.h>
#include <tqhbuttongroup.h>
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders)
: TQWidget(parent) {
- m_layout = tqlayout;
+ m_layout = layout;
m_unit = unit;
TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
marginsFrame->setMargin( KDialog::marginHint() );
grid1->addWidget( marginsFrame, 3, 0 );
- TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
+ TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
KDialog::spacingHint() );
// left margin
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 06c08517..8e503551 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
/**
* Contructor
* @param parent the parent widget
- * @param tqlayout the page tqlayout that this widget should be initialzed with.
+ * @param layout the page layout that this widget should be initialzed with.
* @param unit the unit-type (mm/cm/inch) that the dialog should show
* @param columns the KoColumns (amout of columns) that the preview should be initialized with
* @param unitChooser if true a combobox with the unit-type is shown for the user to change
* @param enableBorders if true enable the user to change the margins (aka borders) of the page
*/
- KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+ KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
const KoColumns& columns, bool unitChooser, bool enableBorders);
/**
@@ -76,11 +76,11 @@ public slots:
signals:
/**
* Emitted whenever the user changed something in the dialog.
- * @param tqlayout the update tqlayout structure with currently displayed info.
+ * @param layout the update layout structure with currently displayed info.
* Note that the info may not be fully correct and physically possible (in which
* case queryClose will return false)
*/
- void propertyChange(KoPageLayout &tqlayout);
+ void propertyChange(KoPageLayout &layout);
protected:
TQComboBox *cpgUnit;
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 682a26d6..316eba19 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const
void KoPageLayout::loadOasis(const TQDomElement &style)
{
- TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
+ TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
if ( !properties.isNull() )
{
ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
KoPageLayout KoPageLayout::standardLayout()
{
- KoPageLayout tqlayout;
- tqlayout.format = KoPageFormat::defaultFormat();
- tqlayout.orientation = PG_PORTRAIT;
- tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
- tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
- tqlayout.ptLeft = MM_TO_POINT( 20.0 );
- tqlayout.ptRight = MM_TO_POINT( 20.0 );
- tqlayout.ptTop = MM_TO_POINT( 20.0 );
- tqlayout.ptBottom = MM_TO_POINT( 20.0 );
- return tqlayout;
+ KoPageLayout layout;
+ layout.format = KoPageFormat::defaultFormat();
+ layout.orientation = PG_PORTRAIT;
+ layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
+ layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
+ layout.ptLeft = MM_TO_POINT( 20.0 );
+ layout.ptRight = MM_TO_POINT( 20.0 );
+ layout.ptTop = MM_TO_POINT( 20.0 );
+ layout.ptBottom = MM_TO_POINT( 20.0 );
+ return layout;
}
struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
{
if ( format == PG_SCREEN )
{
- kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+ kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
return KPrinter::A4;
}
else if ( format == PG_CUSTOM )
{
- kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+ kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
return KPrinter::A4;
}
else if ( format <= PG_LAST_FORMAT )
diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h
index 724f9275..eb922846 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.h
+++ b/kexi/3rdparty/kolibs/koPageLayout.h
@@ -156,7 +156,7 @@ enum KoHFType {
};
/**
- * This structure defines the page tqlayout, including
+ * This structure defines the page layout, including
* its size in pt, its format (e.g. A4), orientation, unit, margins etc.
*/
struct KoPageLayout
@@ -193,18 +193,18 @@ struct KoPageLayout
#ifndef SIMPLE_KOLIBS
/**
- * Save this page tqlayout to OASIS.
+ * Save this page layout to OASIS.
*/
KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
/**
- * Load this page tqlayout from OASIS
+ * Load this page layout from OASIS
*/
KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
#endif
/**
- * @return a page tqlayout with the default page size depending on the locale settings,
+ * @return a page layout with the default page size depending on the locale settings,
* default margins (2 cm), and portrait orientation.
* @since 1.4
*/
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index 5bc7f3b3..99d5e01d 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -49,10 +49,10 @@
/******************************************************************/
/*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
: TQGroupBox( i18n( "Page Preview" ), parent, name )
{
- setPageLayout( tqlayout );
+ setPageLayout( layout );
columns = 1;
setMinimumSize( 150, 150 );
}
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
{
}
-/*=================== set tqlayout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
+/*=================== set layout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &layout )
{
// resolution[XY] is in pixel per pt
double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
- m_pageWidth = tqlayout.ptWidth * resolutionX;
- m_pageHeight = tqlayout.ptHeight * resolutionY;
+ m_pageWidth = layout.ptWidth * resolutionX;
+ m_pageHeight = layout.ptHeight * resolutionY;
double zh = 110.0 / m_pageHeight;
double zw = 110.0 / m_pageWidth;
@@ -79,15 +79,15 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
m_pageWidth *= z;
m_pageHeight *= z;
- m_textFrameX = tqlayout.ptLeft * resolutionX * z;
- m_textFrameY = tqlayout.ptTop * resolutionY * z;
- m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
- m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
+ m_textFrameX = layout.ptLeft * resolutionX * z;
+ m_textFrameY = layout.ptTop * resolutionY * z;
+ m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
+ m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
repaint( true );
}
-/*=================== set tqlayout =================================*/
+/*=================== set layout =================================*/
void KoPagePreview::setPageColumns( const KoColumns &_columns )
{
columns = _columns.columns;
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
/*==================== constructor ===============================*/
KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
- const KoPageLayout& tqlayout,
+ const KoPageLayout& layout,
const KoHeadFoot& hf, int tabs,
KoUnit::Unit unit, bool modal )
: KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
{
flags = tabs;
- m_layout = tqlayout;
+ m_layout = layout;
m_unit = unit;
m_pageSizeTab = 0;
m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
/*==================== constructor ===============================*/
KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
- const KoPageLayout& tqlayout,
+ const KoPageLayout& layout,
const KoHeadFoot& hf,
const KoColumns& columns,
const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
{
flags = tabs;
- m_layout = tqlayout;
+ m_layout = layout;
m_column = columns;
m_unit = unit;
m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
}
/*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
{
bool res = false;
- KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
+ KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
if ( dlg->exec() == TQDialog::Accepted ) {
res = true;
- if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+ if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
unit = dlg->unit();
}
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
}
/*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
{
bool res = false;
- KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+ KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
if ( dlg->exec() == TQDialog::Accepted ) {
res = true;
- if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+ if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
if ( tabs & COLUMNS ) columns = dlg->columns();
if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu
return res;
}
-/*===================== get a standard page tqlayout ===============*/
+/*===================== get a standard page layout ===============*/
KoPageLayout KoPageLayoutDia::standardLayout()
{
return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
}
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
- m_layout.ptWidth = tqlayout.ptWidth;
- m_layout.ptHeight = tqlayout.ptHeight;
- m_layout.ptLeft = tqlayout.ptLeft;
- m_layout.ptRight = tqlayout.ptRight;
- m_layout.ptTop = tqlayout.ptTop;
- m_layout.ptBottom = tqlayout.ptBottom;
- m_layout.format = tqlayout.format;
- m_layout.orientation = tqlayout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
+ m_layout.ptWidth = layout.ptWidth;
+ m_layout.ptHeight = layout.ptHeight;
+ m_layout.ptLeft = layout.ptLeft;
+ m_layout.ptRight = layout.ptRight;
+ m_layout.ptTop = layout.ptTop;
+ m_layout.ptBottom = layout.ptBottom;
+ m_layout.format = layout.format;
+ m_layout.orientation = layout.orientation;
if(m_columnsTab)
- m_columnsTab->setLayout(tqlayout);
+ m_columnsTab->setLayout(layout);
}
/*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
// ------------- header ---------------
TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
- gHead->tqlayout()->setSpacing(KDialog::spacingHint());
- gHead->tqlayout()->setMargin(KDialog::marginHint());
- TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
+ gHead->layout()->setSpacing(KDialog::spacingHint());
+ gHead->layout()->setMargin(KDialog::marginHint());
+ TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
// ------------- footer ---------------
TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
- gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
- gFoot->tqlayout()->setMargin(KDialog::marginHint());
- TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
+ gFoot->layout()->setSpacing(KDialog::spacingHint());
+ gFoot->layout()->setMargin(KDialog::marginHint());
+ TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
TQWidget *tab3 = addPage(i18n( "Col&umns" ));
TQHBoxLayout *lay = new TQHBoxLayout(tab3);
m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
- m_columnsTab->tqlayout()->setMargin(0);
+ m_columnsTab->layout()->setMargin(0);
lay->addWidget(m_columnsTab);
m_columnsTab->show();
connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
TQHBoxLayout *lay = new TQHBoxLayout(tab4);
m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
- m_headerTab->tqlayout()->setMargin(0);
+ m_headerTab->layout()->setMargin(0);
lay->addWidget(m_headerTab);
m_headerTab->show();
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 21fe7df3..1ed23ec5 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
~KoPagePreview();
/**
- * set page tqlayout
+ * set page layout
*/
void setPageLayout( const KoPageLayout& );
void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
class KoPageLayoutDiaPrivate;
/**
- * With this dialog the user can specify the tqlayout of the paper during printing.
+ * With this dialog the user can specify the layout of the paper during printing.
*/
class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
{
@@ -92,14 +92,14 @@ public:
*
* @param parent The parent of the dialog.
* @param name The name of the dialog.
- * @param tqlayout The tqlayout.
+ * @param layout The layout.
* @param headfoot The header and the footer.
* @param flags a variable with all features this dialog should show.
* @param unit The unit to use for displaying the values to the user.
* @param modal Whether the dialog is modal or not.
*/
KoPageLayoutDia( TQWidget* parent, const char* name,
- const KoPageLayout& tqlayout,
+ const KoPageLayout& layout,
const KoHeadFoot& headfoot,
int flags, KoUnit::Unit unit, bool modal=true );
@@ -108,7 +108,7 @@ public:
*
* @param parent The parent of the dialog.
* @param name The name of the dialog.
- * @param tqlayout The tqlayout.
+ * @param layout The layout.
* @param headfoot The header and the footer.
* @param columns The number of columns on the page.
* @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
* @param unit The unit to use for displaying the values to the user
*/
KoPageLayoutDia( TQWidget* parent, const char* name,
- const KoPageLayout& tqlayout,
+ const KoPageLayout& layout,
const KoHeadFoot& headfoot,
const KoColumns& columns,
const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
~KoPageLayoutDia();
/**
- * Show page tqlayout dialog.
+ * Show page layout dialog.
* See constructor for documentation on the parameters
*/
static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
/**
- * Show page tqlayout dialog.
+ * Show page layout dialog.
* See constructor for documentation on the parameters
*/
static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
/**
- * Retrieves a standard page tqlayout.
+ * Retrieves a standard page layout.
* Deprecated: better use KoPageLayout::standardLayout()
*/
static KDE_DEPRECATED KoPageLayout standardLayout();
/**
- * Returns the tqlayout
+ * Returns the layout
*/
- const KoPageLayout& tqlayout() const { return m_layout; }
+ const KoPageLayout& layout() const { return m_layout; }
/**
* Returns the header and footer information
@@ -177,7 +177,7 @@ private:
TQLineEdit *eFootMid;
TQLineEdit *eFootRight;
- // tqlayout
+ // layout
KoPageLayout m_layout;
KoColumns m_column;
@@ -189,7 +189,7 @@ protected slots:
virtual void slotOk();
private slots:
- void sizeUpdated(KoPageLayout &tqlayout);
+ void sizeUpdated(KoPageLayout &layout);
void columnsUpdated(KoColumns &columns);
private:
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 731c38bd..73a55822 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const
KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
: TQWidget( parent ), m_step( 1.0 )
{
- TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
- //tqlayout->setMargin( 2 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+ //layout->setMargin( 2 );
TQPushButton *up = new TQPushButton( "+", this );
//up->setFlat( true );
up->setMaximumHeight( 15 );
up->setMaximumWidth( 15 );
- tqlayout->addWidget( up, 0, 0 );
+ layout->addWidget( up, 0, 0 );
connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
TQPushButton *down = new TQPushButton( "-", this );
down->setMaximumHeight( 15 );
down->setMaximumWidth( 15 );
- tqlayout->addWidget( down, 1, 0 );
+ layout->addWidget( down, 1, 0 );
connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
- tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+ layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
}
KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
KoUnit::Unit unit, unsigned int precision, const char *name )
: TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
{
- TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
- //tqlayout->setMargin( 2 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+ //layout->setMargin( 2 );
TQPushButton *up = new TQPushButton( "+", this );
//up->setFlat( true );
up->setMaximumHeight( 15 );
up->setMaximumWidth( 15 );
- tqlayout->addWidget( up, 0, 0 );
+ layout->addWidget( up, 0, 0 );
connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
TQPushButton *down = new TQPushButton( "-", this );
down->setMaximumHeight( 15 );
down->setMaximumWidth( 15 );
- tqlayout->addWidget( down, 1, 0 );
+ layout->addWidget( down, 1, 0 );
connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
- tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+ layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
}
void
diff --git a/kexi/doc/common/kde-default.css b/kexi/doc/common/kde-default.css
index 59366d38..032a00db 100644
--- a/kexi/doc/common/kde-default.css
+++ b/kexi/doc/common/kde-default.css
@@ -90,7 +90,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
TABLE.programlisting
TABLE.screen { border-style: none;
background-color: rgb(224,224,224);
- table-tqlayout: auto; /* 100%? */
+ table-layout: auto; /* 100%? */
color: rgb(0,0,0); /* should be inherit */
}
@@ -99,7 +99,7 @@ TABLE.screen { border-style: none;
TABLE[class~=programlisting]
TABLE[class~=screen] { border-style: none;
background-color: rgb(224,224,224);
- table-tqlayout: auto;
+ table-layout: auto;
color: inherit;
}
*/
diff --git a/kexi/doc/common/kde-web.css b/kexi/doc/common/kde-web.css
index dfd98e8b..e61fa32a 100644
--- a/kexi/doc/common/kde-web.css
+++ b/kexi/doc/common/kde-web.css
@@ -85,7 +85,7 @@ DIV.INFORMALEXAMPLE { border-style: dotted;
TABLE.programlisting
TABLE.screen { border-style: none;
background-color: rgb(224,224,224);
- table-tqlayout: auto; /* 100%? */
+ table-layout: auto; /* 100%? */
color: rgb(0,0,0); /* should be inherit */
}
@@ -94,7 +94,7 @@ TABLE.screen { border-style: none;
TABLE[class~=programlisting]
TABLE[class~=screen] { border-style: none;
background-color: rgb(224,224,224);
- table-tqlayout: auto;
+ table-layout: auto;
color: inherit;
}
*/
diff --git a/kexi/doc/dev/kexi_guidelines.txt b/kexi/doc/dev/kexi_guidelines.txt
index ab713e34..7c2dfaba 100644
--- a/kexi/doc/dev/kexi_guidelines.txt
+++ b/kexi/doc/dev/kexi_guidelines.txt
@@ -19,7 +19,7 @@ Focus on:
convert to QString only on data displaying)
Idea 3
-Directories tqlayout:
+Directories layout:
dialogs/
+-altertable/
+-datatable/
diff --git a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
index b7b62ab9..e7959df7 100644
--- a/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
+++ b/kexi/doc/handbook/html.tmp/01_02_00_db_spreadsheet.html
@@ -168,7 +168,7 @@ In this case the very way the spreadsheet works is problematic. Fields for data
<a name="reports"></a>
<h4>Reports</h4>
<p>
-Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the tqlayout of fields.
+Databases enable grouping, limiting and summing up data in a form of a <em>report</em>. Spreadsheets are usually printed in a form of small tables without fully automatic control over page divisions and the layout of fields.
</p>
<a name="programming"></a>
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 0de7a77a..5df680c8 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
@@ -256,16 +256,16 @@ The following example presents a form where text fields and labels were placed b
<br>An example form with widgets that cannot not fit in the window<br><br>
</p>
<p>
-Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
+Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget layout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
</p>
<p>
-Using tqlayout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
+Using layout in this form improves alignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
<br>
<br><img src="img/05_04_08_form_well_fit.png">
- <br>Example form with tqlayout used<br><br>
+ <br>Example form with layout used<br><br>
</p>
<p>
-There are two methods to create widget tqlayout.
+There are two methods to create widget layout.
<ul>
<li>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 <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>.</li>
<li>Click a <a hrf="widget_containers">container widget</a> (or a form surface itself), where widgets are inserted and select one of the tqlayout types from the context menu item <a href="aa_00_00_menu.html#menu_format_layout">Layout Widgets</a>. All widgets existing within the container or within the form, being on the same level will be put into a single common tqlayout.</li>
@@ -274,32 +274,32 @@ In each of these cases you can also use <em>Format -&gt; Layout Widgets</em> men
</p>
<p>
<img src="img/05_04_08_form_layout_selecting.png">
- <br>Selecting widgets that will be put into a tqlayout<br>
+ <br>Selecting widgets that will be put into a layout<br>
<br><img src="img/05_04_08_form_layout_selected.png">
<br>Four widgets are selected<br><br>
<br><img src="img/05_04_08_form_layout_popup.png"><br>
- <br>Using the context menu for putting the widgets into a grid tqlayout<br><br>
+ <br>Using the context menu for putting the widgets into a grid layout<br><br>
</p>
<p>
-Widget tqlayout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
+Widget layout is presented in the design view using a blue, green or red box drawn with broken line. This line is displayed only in the form's design view.
</p>
<p>
<br>
<br><img src="img/05_04_08_form_layout_grid.png">
- <br>Widgets within a grid tqlayout<br><br>
+ <br>Widgets within a grid layout<br><br>
</p>
<p>
-Besides the grid type, there are other widget tqlayout types.
+Besides the grid type, there are other widget layout types.
<ul>
<li>vertical
<br>
<br><img src="img/05_04_08_form_layout_vertical.png">
- <br>Vertical widget tqlayout<br><br>
+ <br>Vertical widget layout<br><br>
</li>
<li>horizontal
<br>
<br><img src="img/05_04_08_form_layout_horizontal.png">
- <br>Horizontal widget tqlayout<br><br>
+ <br>Horizontal widget layout<br><br>
</li>
<!-- TODO podzia³ poziomy / pionowy
<br><img src="img/05_04_08_form_layout_vertical_splitter.png">
@@ -322,12 +322,12 @@ A <em>spring</em> in widget layouts is a special, invisible element allowing to
</ol>
</p>
<p>
-For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal tqlayout with the label.
+For the following example, the spring has been inserted on the left hand of the text label &quot;Persons&quot;. The label is thus displayed on the right hand of the form. To make the spring work, it has been put into a common horizontal layout with the label.
<br><img src="img/05_04_08_form_spring.png">
- <br>Horizontal tqlayout containing a spring and a text label<br><br>
+ <br>Horizontal layout containing a spring and a text label<br><br>
</p>
<p>
-To make springs work you need to create a global widget tqlayout i.e. a tqlayout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
+To make springs work you need to create a global widget layout i.e. a layout for the form itself. Then, springs can use edges of the form as a boundary for expanding.
</p>
<a name="advanced_form_layouts"></a>
@@ -337,21 +337,21 @@ Widget layouts can be combined (or nested). On the following example you can ide
</p>
<p>
<ol>
-<li>horizontal tqlayout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
-<li>grid tqlayout grouping widgets on the whole form</li>
+<li>horizontal layout with a spring, aligning the &quot;Persons&quot; text label to the right</li>
+<li>grid layout grouping widgets on the whole form</li>
</ol>
</p>
<p>
<img src="img/05_04_08_form_advanced_layout.png">
- <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
+ <br>Two widget layouts combined: horizontal layout inside of a grid layout<br><br>
</p>
<p>
-The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one &quot;cell&quot; of the grid.
+The horizontal layout is treat in the example as a single widget by the grid layout - it takes exactly one &quot;cell&quot; of the grid.
After opening a form designed this way in the data view, you can notice (by resizing the form) that:
</p>
<ul>
<li>&quot;Persons&quot; text label thanks to the spring used is constantly aligned to the to the right side of the form</li>
-<li>text fields take all of the available width thanks to putting them into the grid tqlayout</li>
+<li>text fields take all of the available width thanks to putting them into the grid layout</li>
<li>all the form's widgets are pushed to the top thanks to the spring used at the bottom of the form</li>
</ul>
<p>
@@ -362,24 +362,24 @@ After opening a form designed this way in the data view, you can notice (by resi
<a name="layout_breaking"></a>
<H4>Removing widget layouts</H4>
<p>
-To remove widget tqlayout without removing widgets, perform one of these actions:
+To remove widget layout without removing widgets, perform one of these actions:
<ul>
-<li>click with the &RMB; on the tqlayout's border and select <em>Break Layout</em> command from the context menu</li>
-<li>click with the &LMB; on the tqlayout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
+<li>click with the &RMB; on the layout's border and select <em>Break Layout</em> command from the context menu</li>
+<li>click with the &LMB; on the layout's border and select <em>Format -&gt; Break Layout</em> menu command</li>
</ul>
</p>
<H4>Notes</H4>
-<p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
+<p>Removing widget layout using the <em>Break Layout</em> command will not remove widgets contained in the layout. If you want to remove the widgets as well, just select the layout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
</p>
<a name="layout_size_types"></a>
-<H4>Size policies for widgets within a tqlayout</H4>
+<H4>Size policies for widgets within a layout</H4>
<p>
Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form.
</p>
<p>
-After putting widgets into a <em>tqlayout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire tqlayout itself. For example, three buttons put into the horizontal tqlayout will be resized to fit their visible text.
+After putting widgets into a <em>layout</em>, typically each widget gets a proportional (<em>Preferred</em>) size policy. These widgets will be automatically resized with preferred settings, depending on their type and size of the entire layout itself. For example, three buttons put into the horizontal layout will be resized to fit their visible text.
</p>
<p>
For each widget inserted into the form, there are settings for size policy available in the <em>Property Editor</em>. The settings are presented as a group of properties called <em>Size Policy</em>.
@@ -403,12 +403,12 @@ There are following values available on the drop down list for <em>Horizontal Si
<li><b>Fixed</b> value means that the widget cannot be automatically resized; it should maintain the constant size defined on design time (width or height),</li>
<li><p><b>Minimum</b> value means that the original size of the widget is set as minimal allowed, it is sufficient and there is no need for expanding the widget, but the widget will be expanded if needed. This type of policy can be used to force widget to be expanded to the whole width or height, especially if you set a <em>stretch</em> value greater than 0.
<br><img src="img/05_04_09_size_policy_minimum.png">
- <br>Text field and two buttons within a grid tqlayout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
+ <br>Text field and two buttons within a grid layout (<em>Minimum</em> horizontal size policy is set for both buttons, so these are slightly wider than needed)<br><br>
</p></li>
<li><b>Maximum</b> value means that the original size of the widget is set as maximum allowed and can be decreased without breaking the widget's usability and readability if other widgets need more space,</li>
<li><p><b>Preferred</b> value means that the original size of the widget is the best and preferred; the widget can be shrunk or expanded however and it will stay readable,
<br><img src="img/05_04_09_size_policy_preferred.png">
- <br>Text field and two buttons within a grid tqlayout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
+ <br>Text field and two buttons within a grid layout (<em>Preferred</em> horizontal size policy is set for both buttons)<br><br>
</p></li>
<li><b>Expanding</b> value means that the original size of the widget is reasonable but the widget can be also shrunk; it can be expanded as well to take as much space as possible,</li>
<li><b>Minimum Expanding</b> value means that the original size of the widget is allowed; it can be expanded to take as much space as possible,</li>
@@ -432,7 +432,7 @@ The most frequently used size policies are <em>Preferred</em>, <em>Minimum</em>
<a name="widget_adjusting"></a>
<H3>5.4.10. Setting widgets size and position by hand</H3>
<p>
-In case when your form has no main tqlayout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
+In case when your form has no main layout set for auto-positioning and auto-resizing its widgets, you will probably want to align widget's position and size so the form can look cleaner and be easier to use. The &kexi; form designer simplifies this task by offering the following groups of commands:
</p>
<ul>
<li><p>Adjusting sizes of selected widgets. The commands are available in the <em>Format -&gt; Adjust Widgets Size</em> submenu of the Menubar and in the <em>Adjust Widgets Size</em> submenu of the context menu. Toolbar's drop down button <nobr><img src="icons/aogrid.png" class="icon"> <em>Adjust Widgets Size</em></nobr> is also available.
@@ -497,7 +497,7 @@ To change tab order, either:
<li>Click a selected widget name on the widgets list and drag it to a desired position (up or down) using the mouse.
</li>
<li>Click a selected widget name on the widgets list and use <em>Move Up</em> or <em>Move Down</em> buttons, to move the widgets to a desired position.</li>
-<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left tqlayout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
+<li>Click the <em>Handle tab stops automatically</em> check box to set the automatic tab order for the form. If this option has been switched on, any changes made to the list of widgets by hand are not taken into account - &kexi; will be handling the tab orders on its own. The automatic ordering means that the top-left widget will be focused first (or the top-right if your operating system uses right-to-left layout), and the order comes from the left to right (from the right to left, appropriately) and from the top to bottom.
<br><img src="img/05_04_11_auto_tab_stop.png">
<br>Automatic tab order for a form<br><br>
</li>
diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt
index 65aa6008..acc00d00 100644
--- a/kexi/doc/handbook/translation-status.txt
+++ b/kexi/doc/handbook/translation-status.txt
@@ -72,7 +72,7 @@ DONE 5.4.9. Widget layouts
DONE * Springs in widget layouts
DONE * Advanced widget layouts
DONE * Removing widget layouts
-DONE * Size policies for widgets within a tqlayout
+DONE * Size policies for widgets within a layout
DONE 5.4.10. Setting widgets size and position by hand
DONE 5.4.11. Setting the tab order
DONE 5.5. Entering data using forms
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index a2cddd89..1d782a20 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -437,7 +437,7 @@ AdjustSizeCommand::execute()
ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
if(item && !item->children()->isEmpty()) { // container
TQSize s;
- if(item->container() && item->container()->tqlayout())
+ if(item->container() && item->container()->layout())
s = w->sizeHint();
else
s = getSizeFromChildren(item);
@@ -614,7 +614,7 @@ AdjustSizeCommand::debug()
LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname,
const TQVariant &oldValue, const TQVariant &value)
- : PropertyCommand(buf, wname, oldValue, value, "tqlayout")
+ : PropertyCommand(buf, wname, oldValue, value, "layout")
{
m_form = FormManager::self()->activeForm();
ObjectTreeItem* titem = m_form->objectTree()->lookup(wname);
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
TQString
LayoutPropertyCommand::name() const
{
- return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
+ return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
}
void
@@ -775,7 +775,7 @@ InsertWidgetCommand::execute()
}
w->move(m_insertRect.x(), m_insertRect.y());
w->resize(m_insertRect.width()-1, m_insertRect.height()-1); // -1 is not to hide dots
- w->setStyle(&(m_container->widget()->tqstyle()));
+ w->setStyle(&(m_container->widget()->style()));
w->setBackgroundOrigin(TQWidget::ParentOrigin);
w->show();
@@ -802,7 +802,7 @@ InsertWidgetCommand::execute()
for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it)
item->addModifiedProperty(*it, w->property(*it));
- m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account
+ m_container->reloadLayout(); // reload the layout to take the new wigdet into account
m_container->setSelectedWidget(w, false);
if (m_container->form()->library()->internalProperty(w->className(),
@@ -864,7 +864,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
}
for(TQWidget *w = list.first(); w; w = list.next())
m_list->append(w);
- m_list->sort(); // we sort them now, before creating the tqlayout
+ m_list->sort(); // we sort them now, before creating the layout
for(TQWidget *w = m_list->first(); w; w = m_list->next())
m_pos.insert(w->name(), w->geometry());
@@ -911,7 +911,7 @@ CreateLayoutCommand::execute()
return;
container->setSelectedWidget(0, false);
- w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
+ w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget
// sizeHint of these widgets depends on geometry, so give them appropriate geometry
if(m_type == Container::HFlow)
w->resize( TQSize(700, 20) );
@@ -938,7 +938,7 @@ CreateLayoutCommand::execute()
((TQSplitter*)w)->setOrientation(Qt::Vertical);
else if(tree->container()) {
tree->container()->setLayout((Container::LayoutType)m_type);
- w->resize(tree->container()->tqlayout()->sizeHint()); // the tqlayout doesn't have its own size
+ w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size
}
container->setSelectedWidget(w, false);
@@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute()
if(!parent)
parent = m_form->objectTree();
- // We reparent every widget to the Container and take them out of the tqlayout
+ // We reparent every widget to the Container and take them out of the layout
TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it)
{
@@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute()
if (!titem)
return; //better this than a crash
TQWidget *w = titem->widget();
- parent->container()->deleteWidget(w); // delete the tqlayout widget
+ parent->container()->deleteWidget(w); // delete the layout widget
FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
}
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index ad468261..41da4b60 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command
TQMap<TQCString, TQSize> m_sizes;
};
-/*! This command is used when switching the tqlayout of a Container. It remembers the old pos
+/*! This command is used when switching the layout of a Container. It remembers the old pos
of every widget inside the Container. */
class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
{
@@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
TQRect m_insertRect;
};
-/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item.
+/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item.
It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need
to supply a WidgetList of the selected widgets. */
class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index e1dcf1be..5bbbde38 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
, m_buffer(0)
{
TQFrame *frame = makeMainWidget();
- TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6);
+ TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6);
// Setup the details widget /////////
TQHBox *details = new TQHBox(frame);
@@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
initTable();
m_table->setData(m_data, false);
m_table->adjustColumnWidthToContents(0);
- tqlayout->addWidget(m_table);
+ layout->addWidget(m_table);
//// Setup the icon toolbar /////////////////
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame);
- vtqlayout->addWidget(newItem);
+ vlayout->addWidget(newItem);
m_buttons.insert(BAdd, newItem);
connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame);
- vtqlayout->addWidget(delItem);
+ vlayout->addWidget(delItem);
m_buttons.insert(BRemove, delItem);
connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
- vtqlayout->addStretch();
+ vlayout->addStretch();
setInitialSize(TQSize(600, 300));
//setWFlags(WDestructiveClose);
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 706ef69b..246940c7 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
return false;
}
- case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse
+ case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse
{
if(m_form->interactiveMode())
m_state = MovingWidget;
@@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
//m_initialPos = TQPoint();
}
- else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout
+ else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout
reloadLayout();
// cancel copying as user released Ctrl before releasing mouse button
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
return;
}
}
- m_container->setGeometry(m_container->geometry()); // just update tqlayout
+ m_container->setGeometry(m_container->geometry()); // just update layout
m_layout->activate();
}
@@ -654,14 +654,14 @@ Container::reloadLayout()
void
Container::createBoxLayout(WidgetList *list)
{
- TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
+ TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout);
for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
list->append( tree->widget());
list->sort();
for(TQWidget *obj = list->first(); obj; obj = list->next())
- tqlayout->addWidget(obj);
+ layout->addWidget(obj);
delete list;
}
@@ -776,7 +776,7 @@ Container::createGridLayout(bool testOnly)
}
}
- // Then we count the number of rows in the tqlayout, and set their beginnings
+ // Then we count the number of rows in the layout, and set their beginnings
for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
{
TQWidget *w = it.current();
@@ -830,11 +830,11 @@ Container::createGridLayout(bool testOnly)
}
kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
- // We create the tqlayout ..
- TQGridLayout *tqlayout=0;
+ // We create the layout ..
+ TQGridLayout *layout=0;
if(!testOnly) {
- tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
- m_layout = (TQLayout*)tqlayout;
+ layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
+ m_layout = (TQLayout*)layout;
}
// .. and we fill it with widgets
@@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly)
ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
if(!endrow && !endcol) {
if(!testOnly)
- tqlayout->addWidget(w, wrow, wcol);
+ layout->addWidget(w, wrow, wcol);
item->setGridPos(wrow, wcol, 0, 0);
}
else {
if(!endcol) endcol = wcol;
if(!endrow) endrow = wrow;
if(!testOnly)
- tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
+ layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1);
}
}
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index 36f35e82..bd46c7a1 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject
void setObjectTree(ObjectTreeItem *t) { m_tree = t; }
//! \return a pointer to the TQLayout of this Container, or 0 if there is not.
- TQLayout* tqlayout() const { return m_layout; }
+ TQLayout* layout() const { return m_layout; }
- //! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
+ //! \return the type of the layout associated to this Container's widget (see LayoutType enum).
LayoutType layoutType() const { return m_layType; }
//! \return the margin of this Container.
@@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
//! \return the spacing of this Container.
int layoutSpacing() { return m_spacing; }
- /*! Sets this Container to use \a type of tqlayout. The widget are inserted
- automatically in the tqlayout following their positions.
+ /*! Sets this Container to use \a type of layout. The widget are inserted
+ automatically in the layout following their positions.
\sa createBoxLayout(), createGridLayout() */
void setLayout(LayoutType type);
@@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
//! \return the string representing the layoutType \a type.
static TQString layoutTypeToString(int type);
- //! \return the LayoutType (an int) for a given tqlayout name.
+ //! \return the LayoutType (an int) for a given layout name.
static LayoutType stringToLayoutType(const TQString &name);
/*! Stops the inline editing of the current widget (as when you click
@@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
to Container's widget. */
void deleteWidget(TQWidget *w);
- /*! Recreates the Container tqlayout. Calls this when a widget has been moved
- or added to update the tqlayout. */
+ /*! Recreates the Container layout. Calls this when a widget has been moved
+ or added to update the layout. */
void reloadLayout();
protected slots:
@@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
/*! Internal function to create a KexiFlowLayout. */
void createFlowLayout();
- /*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout
+ /*! Internal function to create a GridLayout. if \a testOnly is true, the layout
is simulated, and only the widget's grid info aris filled. */
void createGridLayout(bool testOnly=false);
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index d073b43d..281e5604 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
m_contents = addPage(i18n("Contents"));
///////// Setup the "Contents" page /////////////////////////////
- TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6);
+ TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6);
//// Setup the icon toolbar /////////////////
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
TQToolButton *newRow = new TQToolButton(m_contents);
newRow->setIconSet(BarIconSet("edit_add"));
newRow->setTextLabel(i18n("&Add Item"), true);
- vtqlayout->addWidget(newRow);
+ vlayout->addWidget(newRow);
m_buttons.insert(BNewRow, newRow);
connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
TQToolButton *newChild = new TQToolButton(m_contents);
newChild->setIconSet(BarIconSet("1rightarrow"));
newChild->setTextLabel(i18n("New &Subitem"), true);
- vtqlayout->addWidget(newChild);
+ vlayout->addWidget(newChild);
m_buttons.insert(BNewChild, newChild);
connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
TQToolButton *delRow = new TQToolButton(m_contents);
delRow->setIconSet(BarIconSet("edit_remove"));
delRow->setTextLabel(i18n("&Remove Item"), true);
- vtqlayout->addWidget(delRow);
+ vlayout->addWidget(delRow);
m_buttons.insert(BRemRow, delRow);
connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
TQToolButton *rowUp = new TQToolButton(m_contents);
rowUp->setIconSet(BarIconSet("1uparrow"));
rowUp->setTextLabel(i18n("Move Item &Up"), true);
- vtqlayout->addWidget(rowUp);
+ vlayout->addWidget(rowUp);
m_buttons.insert(BRowUp, rowUp);
connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
TQToolButton *rowDown = new TQToolButton(m_contents);
rowDown->setIconSet(BarIconSet("1downarrow"));
rowDown->setTextLabel(i18n("Move Item &Down"), true);
- vtqlayout->addWidget(rowDown);
+ vlayout->addWidget(rowDown);
m_buttons.insert(BRowDown, rowDown);
connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
- vtqlayout->addStretch();
+ vlayout->addStretch();
//// The listview ///////////
m_listview = new KListView(m_contents, "editlistview_listview");
@@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
m_listview->setDropVisualizer(true);
m_listview->setAcceptDrops(true);
m_listview->setSorting(-1);
- tqlayout->addWidget(m_listview);
+ layout->addWidget(m_listview);
m_listview->setFocus();
connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index e41e5613..e87c300e 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
emit handleDropEvent(e);
}
-/// Various tqlayout widgets /////////////////:
+/// Various layout widgets /////////////////:
HBox::HBox(TQWidget *parent, const char *name)
: TQFrame(parent, name), m_preview(false)
@@ -220,8 +220,8 @@ VFlow::paintEvent(TQPaintEvent *)
TQSize
VFlow::sizeHint() const
{
- if(tqlayout())
- return tqlayout()->sizeHint();
+ if(layout())
+ return layout()->sizeHint();
else
return TQSize(700, 50); // default
}
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 2607fcca..e6b13f0e 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -511,7 +511,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
else if(classname == "KPushButton")
{
KPushButton *push = static_cast<KPushButton*>(w);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_PushButtonContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_PushButtonContents, w);
TQRect editorRect = TQRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height());
//r.setX(r.x() + 5);
//r.setY(r.y() + 5);
@@ -523,7 +523,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
{
TQRadioButton *radio = static_cast<TQRadioButton*>(w);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_RadioButtonContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w);
TQRect editorRect = TQRect(radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height());
createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto);
return true;
@@ -533,7 +533,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
TQCheckBox *check = static_cast<TQCheckBox*>(w);
//TQRect r(check->geometry());
//r.setX(r.x() + 20);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_CheckBoxContents, w);
TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto);
return true;
@@ -645,19 +645,19 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
{
- r = widget->tqstyle().subRect(TQStyle::SR_RadioButtonContents, widget);
+ r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget);
p += r.topLeft();
s.setWidth(r.width());
}
else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
{
- r = widget->tqstyle().subRect(TQStyle::SR_CheckBoxContents, widget);
+ r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget);
p += r.topLeft();
s.setWidth(r.width());
}
else if(classname == "KPushButton")
{
- r = widget->tqstyle().subRect(TQStyle::SR_PushButtonContents, widget);
+ r = widget->style().subRect(TQStyle::SR_PushButtonContents, widget);
p += r.topLeft();
s = r.size();
}
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 6ed3e570..52d44966 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -528,7 +528,7 @@ Form::autoAssignTabStops()
d->tabstops.clear();
/// We automatically sort widget from the top-left to bottom-right corner
- //! \todo Handle RTL tqlayout (ie from top-right to bottom-left)
+ //! \todo Handle RTL layout (ie from top-right to bottom-left)
foreach_list(WidgetListIterator, it, list) {
TQWidget *w = it.current();
hlist.append(w);
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 9bb68925..a8bd6dc0 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject
//! @todo make gridSize configurable at global level
int gridSize() { return 10; }
- //! \return the default margin for all the tqlayout inside this Form.
+ //! \return the default margin for all the layout inside this Form.
int defaultMargin() { return 11;}
- //! \return the default spacing for all the tqlayout inside this Form.
+ //! \return the default spacing for all the layout inside this Form.
int defaultSpacing() { return 6;}
/*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */
@@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
(which are by default in order of creation).*/
void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;}
- /*! Tells the Form to reassign the tab stops because the widget tqlayout has changed
+ /*! Tells the Form to reassign the tab stops because the widget layout has changed
(called for example before saving or displaying the tab order dialog).
Automatically sorts widget from the top-left to bottom-right corner.
Widget can be grouped with containers. In paticular, for tab widgets,
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 9161049d..bf3b9d08 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -66,7 +66,7 @@ void
CustomWidget::paintEvent(TQPaintEvent *)
{
TQPainter p(this);
- p.setPen(tqpalette().active().text());
+ p.setPen(palette().active().text());
TQRect r(rect());
r.setX(r.x()+2);
p.drawText(r, TQt::AlignTop, m_className);
@@ -971,7 +971,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
// if (-1 != item->widget()->metaObject()->findProperty("dataSource"))
// savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
- // We don't want to save the geometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+ // We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example)
if(item && !item->parent()) {
// save form widget size, but not its position
savePropertyValue(tclass, domDoc, "geometry",
@@ -999,7 +999,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
savedAlignment = true;
}
}
- else if(name == "name" || name == "geometry" || name == "tqlayout") {
+ else if(name == "name" || name == "geometry" || name == "layout") {
// these have already been saved
}
else {
@@ -1017,42 +1017,42 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
}
}
- // Saving container 's tqlayout if there is one
- TQDomElement tqlayout;
+ // Saving container 's layout if there is one
+ TQDomElement layout;
if(item->container() && item->container()->layoutType() != Container::NoLayout)
{
- if(item->container()->tqlayout()) // there is a tqlayout
+ if(item->container()->layout()) // there is a layout
{
- tqlayout = domDoc.createElement("temp");
- savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
+ layout = domDoc.createElement("temp");
+ savePropertyValue(layout, domDoc, "name", "unnamed", item->widget());
if(item->modifiedProperties()->contains("layoutMargin"))
- savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+ savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin());
if(item->modifiedProperties()->contains("layoutSpacing"))
- savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
- tclass.appendChild(tqlayout);
+ savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing());
+ tclass.appendChild(layout);
}
}
int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
switch(layoutType) {
- case Container::Grid: // grid tqlayout
+ case Container::Grid: // grid layout
{
- tqlayout.setTagName("grid");
+ layout.setTagName("grid");
for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
- saveWidget(objIt, tqlayout, domDoc, true);
+ saveWidget(objIt, layout, domDoc, true);
break;
}
case Container::HBox: case Container::VBox:
{
// as we don't save geometry, we need to sort widgets in the right order, not creation order
WidgetList *list;
- if(tqlayout.tagName() == "hbox") {
+ if(layout.tagName() == "hbox") {
list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
- tqlayout.setTagName("hbox");
+ layout.setTagName("hbox");
}
else {
list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget());
- tqlayout.setTagName("vbox");
+ layout.setTagName("vbox");
}
for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
@@ -1062,28 +1062,28 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
for(TQWidget *obj = list->first(); obj; obj = list->next()) {
ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
if(item)
- saveWidget(titem, tqlayout, domDoc);
+ saveWidget(titem, layout, domDoc);
}
delete list;
break;
}
case Container::HFlow: case Container::VFlow:
{
- tqlayout.setTagName("grid");
- KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+ layout.setTagName("grid");
+ KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
if(!flow) break;
WidgetList *list = (WidgetList*)flow->widgetList();
// save some special properties
- savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
- savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
+ savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
+ savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) );
- // fill the widget's grid info, ie just simulate grid tqlayout
+ // fill the widget's grid info, ie just simulate grid layout
item->container()->createGridLayout(true);
for(TQWidget *obj = list->first(); obj; obj = list->next()) {
ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
if(item)
- saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner
+ saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner
}
delete list;
break;
@@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
else if(tagName == "vbox")
classname = "VBox";
else if(tagName == "grid") {
- // first, see if it is flow tqlayout
+ // first, see if it is flow layout
for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling()) {
if((child.toElement().tagName() == "property")
&& (child.toElement().attribute("name") == "customLayout"))
@@ -1204,7 +1204,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
KAcceleratorManager::setNoAccel(w);
}
#endif
- w->setStyle(&(container->widget()->tqstyle()));
+ w->setStyle(&(container->widget()->style()));
w->show();
// We create and insert the ObjectTreeItem at the good place in the ObjectTree
@@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
m_currentItem = item;
// if we are inside a Grid, we need to insert the widget in the good cell
if(container->layoutType() == Container::Grid) {
- TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
+ TQGridLayout *layout = (TQGridLayout*)container->layout();
if(el.hasAttribute("rowspan")) { // widget spans multiple cells
- if(tqlayout)
- tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
+ if(layout)
+ layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
el.attribute("column").toInt(), el.attribute("column").toInt() + el.attribute("colspan").toInt()-1);
item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), el.attribute("rowspan").toInt(),
el.attribute("colspan").toInt());
}
else {
- if(tqlayout)
- tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
+ if(layout)
+ layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), 0, 0);
}
}
- else if(container->tqlayout())
- container->tqlayout()->add(w);
+ else if(container->layout())
+ container->layout()->add(w);
readChildNodes(item, container, el, w);
- if(item->container() && item->container()->tqlayout())
- item->container()->tqlayout()->activate();
+ if(item->container() && item->container()->layout())
+ item->container()->layout()->activate();
// We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later
TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className()));
@@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
//if(name == "geometry")
// hasGeometryProp = true;
if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
- (name == "name")) // we don't care about tqlayout names
+ (name == "name")) // we don't care about layout names
continue;
if (node.attribute("subwidget")=="true") {
@@ -1355,22 +1355,22 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
if(name == "buddy")
m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w);
else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
- item->container() && item->container()->tqlayout()) {
+ item->container() && item->container()->layout()) {
// We load the margin of a Layout
if(name == "margin") {
int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
item->container()->setLayoutMargin(margin);
- item->container()->tqlayout()->setMargin(margin);
+ item->container()->layout()->setMargin(margin);
}
// We load the spacing of a Layout
else if(name == "spacing") {
int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
item->container()->setLayoutSpacing(spacing);
- item->container()->tqlayout()->setSpacing(spacing);
+ item->container()->layout()->setSpacing(spacing);
}
else if((name == "justify")){
bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool();
- KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+ KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
if(flow)
flow->setJustified(justify);
}
@@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
loadWidget(container, node, w);
}
else if(tag == "grid") {
- // first, see if it is flow tqlayout
+ // first, see if it is flow layout
TQString layoutName;
for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) {
if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) {
@@ -1430,33 +1430,33 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
if(layoutName == "HFlow") {
item->container()->m_layType = Container::HFlow;
- KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
- tqlayout->setOrientation(Qt::Horizontal);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+ layout->setOrientation(Qt::Horizontal);
+ item->container()->m_layout = (TQLayout*)layout;
}
else if(layoutName == "VFlow") {
item->container()->m_layType = Container::VFlow;
- KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
- tqlayout->setOrientation(Qt::Vertical);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+ layout->setOrientation(Qt::Vertical);
+ item->container()->m_layout = (TQLayout*)layout;
}
- else { // grid tqlayout
+ else { // grid layout
item->container()->m_layType = Container::Grid;
- TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1);
+ item->container()->m_layout = (TQLayout*)layout;
}
readChildNodes(item, container, node, w);
}
else if(tag == "vbox") {
item->container()->m_layType = Container::VBox;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget());
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQVBoxLayout *layout = new TQVBoxLayout(item->widget());
+ item->container()->m_layout = (TQLayout*)layout;
readChildNodes(item, container, node, w);
}
else if(tag == "hbox") {
item->container()->m_layType = Container::HBox;
- TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget());
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQHBoxLayout *layout = new TQHBoxLayout(item->widget());
+ item->container()->m_layout = (TQLayout*)layout;
readChildNodes(item, container, node, w);
}
else {// unknown tag, we let the Factory handle it
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index f75a4232..b212f00e 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
m_style->setEditable(false);
KGlobal::config()->setGroup("General");
- TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower();
+ TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower();
const TQStringList styles = TQStyleFactory::keys();
m_style->setItems(styles);
m_style->setCurrentItem(0);
@@ -660,7 +660,7 @@ FormManager::previewForm(Form *form, TQWidget *container, Form *toForm)
else
myform = toForm;
myform->createToplevel(container);
- container->setStyle( &(form->widget()->tqstyle()) );
+ container->setStyle( &(form->widget()->style()) );
if (!FormIO::loadFormFromDom(myform, container, domDoc)) {
delete myform;
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
const uint widgetsCount = container->form()->selectedWidgets()->count();
const bool multiple = widgetsCount > 1;
//const bool enableRemove = w != m_active->widget();
- // We only enabletqlayout creation if more than one widget with the same parent are selected
+ // We only enablelayout creation if more than one widget with the same parent are selected
const bool enableLayout = multiple || w == container->widget();
m_menuWidget = w;
@@ -1095,7 +1095,7 @@ void
FormManager::createLayout(int layoutType)
{
WidgetList *list = m_active->selectedWidgets();
- // if only one widget is selected (a container), we modify its tqlayout
+ // if only one widget is selected (a container), we modify its layout
if (list->isEmpty()) {//sanity check
kdWarning() << "FormManager::createLayout(): list is empty!" << endl;
return;
@@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType)
if(list->count() == 1)
{
ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
- if(!item || !item->container() || !m_propSet->contains("tqlayout"))
+ if(!item || !item->container() || !m_propSet->contains("layout"))
return;
- (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
+ (*m_propSet)["layout"] = Container::layoutTypeToString(layoutType);
return;
}
@@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType)
kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
if(w->parentWidget() != parent)
{
- KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
+ KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n"
"All selected widgets must have the same parent."));
kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
return;
@@ -1143,7 +1143,7 @@ FormManager::breakLayout()
else // normal container
{
if(activeForm()->selectedWidgets()->count() == 1)
- (*m_propSet)["tqlayout"] = "NoLayout";
+ (*m_propSet)["layout"] = "NoLayout";
else
container->setLayout(Container::NoLayout);
}
@@ -1500,7 +1500,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
}
enableAction("format_font", fontEnabled);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
bool containerSelected = false;
if(!multiple)
{
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index f5c72d73..677a3e7b 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
/*! Creates a dialog to edit the Connection of \ref activeForm(). */
void editConnections();
- //! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
+ //! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand).
void layoutHBox();
- //! Lay out selected widgets using VBox tqlayout.
+ //! Lay out selected widgets using VBox layout.
void layoutVBox();
- //! Lay out selected widgets using Grid tqlayout.
+ //! Lay out selected widgets using Grid layout.
void layoutGrid();
//! Lay out selected widgets in an horizontal splitter
void layoutHSplitter();
//! Lay out selected widgets in a verticak splitter
void layoutVSplitter();
- //! Lay out selected widgets using HFlow tqlayout
+ //! Lay out selected widgets using HFlow layout
void layoutHFlow();
- //! Lay out selected widgets using VFlow tqlayout.
+ //! Lay out selected widgets using VFlow layout.
void layoutVFlow();
- //! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
+ //! Breaks selected layout(calls \ref BreakLayoutCommand).
void breakLayout();
void alignWidgetsToLeft();
@@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */
virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
#endif
- /*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
+ /*! Function called by the "Lay out in..." menu items. It creates a layout from the
currently selected widgets (that must have the same parent).
Calls \ref CreateLayoutCommand. */
void createLayout(int layoutType);
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 1a7b7dda..79f1b05f 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
ENABLE_ACTION("format_raise", true);
ENABLE_ACTION("format_lower", true);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
if(!multiple)
{
KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() );
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 07e7edfd..02996580 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
ENABLE_ACTION("format_raise", true);
ENABLE_ACTION("format_lower", true);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
bool containerSelected = false;
if(!multiple)
{
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 953b220b..55f8cde6 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -79,7 +79,7 @@ class WidgetLibraryPrivate
/*! @todo: reenable */ advancedProperties.insert("palette", (char*)1);
advancedProperties.insert("backgroundOrigin", (char*)1);
advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless
- advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things
+ advancedProperties.insert("layout", (char*)1);// too large risk to break things
// by providing this in propeditor
advancedProperties.insert("minimumSize", (char*)1);
advancedProperties.insert("maximumSize", (char*)1);
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 8d7d7daf..73c79c30 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
));
}*/
- if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property
+ if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property
createLayoutProperty(tree);
}
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
saveAlignProperty(property);
return;
}
- else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
+ else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
saveLayoutProperty(property, value);
return;
}
@@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
if (!container || !KFormDesigner::FormManager::self()->activeForm() ||
!KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget())
return;
- // special containers have no 'tqlayout' property, as it should not be changed
+ // special containers have no 'layout' property, as it should not be changed
TQCString className = container->widget()->className();
if((className == "HBox") || (className == "VBox") || (className == "Grid"))
return;
@@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
- KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value,
+ KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value,
i18n("Container's Layout"), i18n("Container's Layout"));
p->setVisible( container->form()->library()->advancedPropertiesVisible() );
d->set.addProperty(p);
- updatePropertyValue(item, "tqlayout");
+ updatePropertyValue(item, "layout");
p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
d->set.addProperty(p);
@@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
return;
container = item->container();
- if(prop == "tqlayout") {
+ if(prop == "layout") {
Container::LayoutType type = Container::stringToLayoutType(value.toString());
- if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing)
+ if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing)
d->lastCommand->setValue(value);
else if(!d->isUndoing) {
d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(),
- d->set["tqlayout"].oldValue(), value);
+ d->set["layout"].oldValue(), value);
KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
}
@@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
return;
}
- if(prop == "layoutMargin" && container->tqlayout()) {
+ if(prop == "layoutMargin" && container->layout()) {
container->setLayoutMargin(value.toInt());
- container->tqlayout()->setMargin(value.toInt());
+ container->layout()->setMargin(value.toInt());
}
- else if(prop == "layoutSpacing" && container->tqlayout()) {
+ else if(prop == "layoutSpacing" && container->layout()) {
container->setLayoutSpacing(value.toInt());
- container->tqlayout()->setSpacing(value.toInt());
+ container->layout()->setSpacing(value.toInt());
}
ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name());
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index f1f96a99..896d309c 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -168,10 +168,10 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
and modifies the "alignment" property of the widget.*/
void saveAlignProperty(const TQString &property);
- /*! Creates the "tqlayout" property, for the Container representing \a item. */
+ /*! Creates the "layout" property, for the Container representing \a item. */
void createLayoutProperty(ObjectTreeItem *item);
- /*! Saves the "tqlayout" property and changes the Container 's tqlayout (
+ /*! Saves the "layout" property and changes the Container 's layout (
using Container::setLayout() ).*/
void saveLayoutProperty(const TQString &property, const TQVariant &value);
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 10654e7e..0f2bcf9b 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -120,7 +120,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
const int old_length = str.length();
int i;
for ( i = 0; i < old_length; i++ ) { //anything to escape?
- const unsigned int ch = str[i].tqunicode();
+ const unsigned int ch = str[i].unicode();
if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0')
break;
}
@@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
int new_length = 0;
new_string[new_length++] = '\''; //prepend '
for ( i = 0; i < old_length; i++, new_length++ ) {
- const unsigned int ch = str[i].tqunicode();
+ const unsigned int ch = str[i].unicode();
if (ch == '\\') {
new_string[new_length++] = '\\';
new_string[new_length] = '\\';
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index 08d639ba..cf478b94 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -188,7 +188,7 @@ bool SQLiteConnection::drv_useDatabase( const TQString &dbName, bool *cancelled,
d->res = sqlite3_open(
//TQFile::encodeName( data()->fileName() ),
- data()->fileName().utf8(), /* tqunicode expected since SQLite 3.1 */
+ data()->fileName().utf8(), /* unicode expected since SQLite 3.1 */
&d->data,
exclusiveFlag,
allowReadonly /* If 1 and locking fails, try opening in read-only mode */
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index 55fc4560..ed1afdcb 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -45,9 +45,9 @@ TQString KexiUtils::string2FileName(const TQString &s)
inline TQString char2Identifier(const TQChar& c)
{
- if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE)
+ if (c.unicode() >= TRANSLITERATION_TABLE_SIZE)
return TQString(TQChar('_'));
- const char *const s = transliteration_table[c.tqunicode()];
+ const char *const s = transliteration_table[c.unicode()];
return s ? TQString::fromLatin1(s) : TQString(TQChar('_'));
}
diff --git a/kexi/kexiutils/transliteration_table.h b/kexi/kexiutils/transliteration_table.h
index 0eece11c..5be7dadc 100644
--- a/kexi/kexiutils/transliteration_table.h
+++ b/kexi/kexiutils/transliteration_table.h
@@ -1,4 +1,4 @@
-/* Transliteration table of 65535 tqunicode characters
+/* Transliteration table of 65535 unicode characters
Do not edit this file, it is generated
by ./generate_transliteration_table.sh script. */
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index fd6c4e87..dca4998b 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -226,7 +226,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string)
TQCString cstr(string.latin1());
TQByteArray array( size );
for (uint i=0; i<size; i++) {
- array[i] = char(string[i].tqunicode()-1);
+ array[i] = char(string[i].unicode()-1);
}
TQMap<TQString,TQString> map;
TQDataStream ds(array, IO_ReadOnly);
@@ -244,13 +244,13 @@ TQString KexiUtils::stringToFileName(const TQString& string)
void KexiUtils::simpleCrypt(TQString& string)
{
for (uint i=0; i<string.length(); i++)
- string[i] = TQChar( string[i].tqunicode() + 47 + i );
+ string[i] = TQChar( string[i].unicode() + 47 + i );
}
void KexiUtils::simpleDecrypt(TQString& string)
{
for (uint i=0; i<string.length(); i++)
- string[i] = TQChar( string[i].tqunicode() - 47 - i );
+ string[i] = TQChar( string[i].unicode() - 47 - i );
}
void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index ffa2a85d..81e4f41e 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -184,7 +184,7 @@ namespace KexiUtils
KEXIUTILS_EXPORT TQString stringToFileName(const TQString& string);
/*! Performs a simple \a string encryption using rot47-like algorithm.
- Each character's tqunicode value is increased by 47 + i (where i is index of the character).
+ Each character's unicode value is increased by 47 + i (where i is index of the character).
The resulting string still contains redable characters.
Do not use this for data that can be accessed by attackers! */
KEXIUTILS_EXPORT void simpleCrypt(TQString& string);
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index b46eb20d..80f3c83e 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
, d( new Private() )
{
m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
- tqlayout()->setMargin( KDialog::marginHint() );
- tqlayout()->setSpacing( KDialog::spacingHint() );
+ layout()->setMargin( KDialog::marginHint() );
+ layout()->setSpacing( KDialog::spacingHint() );
KAction *a = KStdAction::findNext(0, 0, 0);
m_btnFind->setText(a->text());
m_btnFind->setIconSet(a->iconSet());
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index dc7fc428..5e39ab13 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -127,7 +127,7 @@
//! width changes will be removed in KMDI
//#define PROPEDITOR_VISIBILITY_CHANGES
-//temporary fix to manage tqlayout
+//temporary fix to manage layout
#include "ksplitter.h"
#define KDOCKWIDGET_P 1
@@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
TQToolButton *closeButton = new TQToolButton( tabWidget() );
closeButton->setAutoRaise( true );
closeButton->setPixmap( TQPixmap( kde2_closebutton ) );
- closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background());
+ closeButton->setPaletteBackgroundColor(closeButton->palette().active().background());
// closeButton->setIconSet(SmallIconSet("tab_remove"));
tabWidget()->setCornerWidget( closeButton, TQt::TopRight );
closeButton->hide(); // hide until it's needed to avoid problems in "user mode"
@@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions()
}
#endif
#ifdef TQ_WS_WIN
- showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32
+ showMaximized();//js: workaround for not yet completed layout settings storage on win32
#endif
}
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 4bf6deec..ff46ee7a 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -115,7 +115,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -222,7 +222,7 @@
</widget>
<widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 60e98852..6e104659 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection"));
TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections"));
d->stack->addWidget(m_remote);
- if (m_remote->tqlayout())
- m_remote->tqlayout()->setMargin(0);
+ if (m_remote->layout())
+ m_remote->layout()->setMargin(0);
// connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn()));
connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),
this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*)));
@@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id)
if (m_remote->list->firstChild()) {
m_remote->list->setSelected(m_remote->list->firstChild(),true);
}
- m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background());
- m_remote->descGroupBox->tqlayout()->setMargin(2);
+ m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background());
+ m_remote->descGroupBox->layout()->setMargin(2);
m_remote->list->setFocus();
slotConnectionSelectionChanged();
}
@@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn()
m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening,
d->stack, "openExistingFileDlg");
m_fileDlg->setConfirmOverwrites( d->confirmOverwrites );
-// static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
+// static_cast<TQVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg );
d->stack->addWidget(m_fileDlg);
for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 4ac59bc0..0ee1e4dd 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -22,7 +22,7 @@
#include "KexiDBTitlePageBase.h"
-//! @short A helper widget used to displaying a line edit with a label and tqlayout
+//! @short A helper widget used to displaying a line edit with a label and layout
class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
{
Q_OBJECT
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 0e7f872a..c8d36aab 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*)));
connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*)));
-// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types);
-// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1);
+// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
+// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1);
// updateGeometry();
addPage(m_prjtype_sel, i18n("Select Storage Method"));
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index 2f778429..b74936dd 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -75,7 +75,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 72db4af2..71e4a317 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -48,8 +48,8 @@ KexiStartupFileDialog::KexiStartupFileDialog(
TQPoint point( 0, 0 );
reparent( parentWidget(), point );
- if (tqlayout())
- tqlayout()->setMargin(0);
+ if (layout())
+ layout()->setMargin(0);
setMinimumHeight(100);
setSizeGripEnabled ( false );
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 6d42da24..3592557c 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -274,7 +274,7 @@ void ImportWizard::setupDstTitle()
{
m_dstTitlePage = new KexiDBTitlePage(i18n("Destination project's caption:"),
this, "KexiDBTitlePage");
- m_dstTitlePage->tqlayout()->setMargin( KDialog::marginHint() );
+ m_dstTitlePage->layout()->setMargin( KDialog::marginHint() );
m_dstTitlePage->updateGeometry();
m_dstNewDBNameLineEdit = m_dstTitlePage->le_caption;
addPage(m_dstTitlePage, i18n("Select Destination Database Project's Caption"));
@@ -555,7 +555,7 @@ void ImportWizard::arriveImportingPage() {
KexiMigrate* sourceDriver = prepareImport(result);
if (sourceDriver) {
showOptions = !result.error()
- && sourceDriver->propertyValue( "source_database_has_nontqunicode_encoding" ).toBool();
+ && sourceDriver->propertyValue( "source_database_has_nonunicode_encoding" ).toBool();
KexiMigration::Data *data = sourceDriver->data();
sourceDriver->setData( 0 );
delete data;
@@ -802,7 +802,7 @@ tristate ImportWizard::import()
if (sourceDriver && !result.error())
{
if (!m_sourceDBEncoding.isEmpty()) {
- sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding",
+ sourceDriver->setPropertyValue( "source_database_nonunicode_encoding",
TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250"
);
}
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index a20dbe21..bec4de7d 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -581,7 +581,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label
if (simpleItem->data == "kaction") {
if (!d->kactionPageWidget) {
- //create lbl+list view with a vtqlayout
+ //create lbl+list view with a vlayout
d->kactionPageWidget = new TQWidget();
d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
@@ -605,7 +605,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
}
else if (simpleItem->data == "currentForm") {
if (!d->currentFormActionsPageWidget) {
- //create lbl+list view with a vtqlayout
+ //create lbl+list view with a vlayout
d->currentFormActionsPageWidget = new TQWidget();
d->currentFormActionsPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
TQVBoxLayout *vlyr = new TQVBoxLayout(d->currentFormActionsPageWidget, 0, KDialog::spacingHint());
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index d87b31c5..c46b04de 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -535,7 +535,7 @@ KexiDBFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDesign
else if (classname == "KexiDBCheckBox") {
KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(w);
TQRect r( cb->geometry() );
- r.setLeft( r.left() + 2 + cb->tqstyle().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
+ r.setLeft( r.left() + 2 + cb->style().subRect( TQStyle::SR_CheckBoxIndicator, cb ).width() );
createEditor(classname, cb->text(), cb, container, r, TQt::AlignAuto);
return true;
}
diff --git a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
index 68dea85f..e8da5ad5 100644
--- a/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
+++ b/kexi/plugins/forms/kexidbtextwidgetinterface.cpp
@@ -53,7 +53,7 @@ void KexiDBTextWidgetInterface::paint( TQFrame *w, TQPainter* p, bool textIsEmpt
if (w->hasFocus()) {
p->setPen(
KexiUtils::blendedColors(
- m_autonumberDisplayParameters->textColor, w->tqpalette().active().base(), 1, 3));
+ m_autonumberDisplayParameters->textColor, w->palette().active().base(), 1, 3));
}
KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
2 + margin + w->margin(), margin, w->width() - margin*2 -2-2,
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 36a64db7..c6d689f7 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -90,7 +90,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
if (viewMode()==Kexi::DataViewMode) {
m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
- m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->tqpalette().active().background());
+ m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
//moved to formmanager connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
}
else
@@ -860,7 +860,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
setAvailable("formpart_format_raise", true);
setAvailable("formpart_format_lower", true);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
if(!multiple)
{
KFormDesigner::ObjectTreeItem *item = f->objectTree()->lookup( f->selectedWidgets()->first()->name() );
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 3a8e8453..9437faca 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -57,7 +57,7 @@ class KexiDBAutoField::Private
//!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto
WidgetType widgetType_property; //!< provides widget type or Auto
LabelPosition lblPosition;
- TQBoxLayout *tqlayout;
+ TQBoxLayout *layout;
TQLabel *label;
TQString caption;
KexiDB::Field::Type fieldTypeInternal;
@@ -104,7 +104,7 @@ void
KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
{
d->fieldTypeInternal = KexiDB::Field::InvalidType;
- d->tqlayout = 0;
+ d->layout = 0;
m_subwidget = 0;
d->label = new TQLabel(text, this);
d->label->installEventFilter( this );
@@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType()
setLabelPosition(pos);
setWidgetType(type);
- d->baseColor = tqpalette().active().base();
- d->textColor = tqpalette().active().text();
+ d->baseColor = palette().active().base();
+ d->textColor = palette().active().text();
}
void
@@ -222,25 +222,25 @@ void
KexiDBAutoField::setLabelPosition(LabelPosition position)
{
d->lblPosition = position;
- if(d->tqlayout) {
- TQBoxLayout *lyr = d->tqlayout;
- d->tqlayout = 0;
+ if(d->layout) {
+ TQBoxLayout *lyr = d->layout;
+ d->layout = 0;
delete lyr;
}
if(m_subwidget)
m_subwidget->show();
- //! \todo support right-to-left tqlayout where positions are inverted
+ //! \todo support right-to-left layout where positions are inverted
if (position==Top || position==Left) {
int align = d->label->alignment();
if(position == Top) {
- d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQVBoxLayout(this);
align |= AlignVertical_Mask;
align ^= AlignVertical_Mask;
align |= AlignTop;
}
else {
- d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
align |= AlignVertical_Mask;
align ^= AlignVertical_Mask;
align |= AlignVCenter;
@@ -254,14 +254,14 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
else {
d->label->show();
}
- d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
+ d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
if(position == Left && d->widgetType != Boolean)
- d->tqlayout->addSpacing(KexiDBAutoField_SPACING);
- d->tqlayout->addWidget(m_subwidget, 1);
+ d->layout->addSpacing(KexiDBAutoField_SPACING);
+ d->layout->addWidget(m_subwidget, 1);
KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
if (subwidgetInterface) {
if (subwidgetInterface->appendStretchRequired(this))
- d->tqlayout->addStretch(0);
+ d->layout->addStretch(0);
if (subwidgetInterface->subwidgetStretchRequired(this)) {
TQSizePolicy sizePolicy( m_subwidget->sizePolicy() );
if(position == Left) {
@@ -279,11 +279,11 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
// m_subwidget->setSizePolicy(...);
}
else {
- d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
d->label->hide();
- d->tqlayout->addWidget(m_subwidget);
+ d->layout->addWidget(m_subwidget);
}
- //a hack to force tqlayout to be refreshed (any better idea for this?)
+ //a hack to force layout to be refreshed (any better idea for this?)
resize(size()+TQSize(1,0));
resize(size()-TQSize(1,0));
if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) {
@@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
realText = text[0].upper() + text.mid(1);
if (d->widgetType!=Boolean) {
//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-//! @todo support right-to-left tqlayout where position of ":" is inverted
+//! @todo support right-to-left layout where position of ":" is inverted
realText += ": ";
}
}
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index db56b550..5d2a24fd 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const
void KexiDBComboBox::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
- TQColorGroup cg( tqpalette().active() );
+ TQColorGroup cg( palette().active() );
// if ( hasFocus() )
// cg.setColor(TQColorGroup::Base, cg.highlight());
// else
@@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
return;
}
-//! @todo support reverse tqlayout
+//! @todo support reverse layout
//bool reverse = TQApplication::reverseLayout();
- tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+ style().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
flags, (uint)TQStyle::SC_All,
(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
);
@@ -157,11 +157,11 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
else { //not editable: we need to paint the current item
TQRect editorGeometry( this->editorGeometry() );
if ( hasFocus() ) {
- if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
+ if (0==qstrcmp(style().name(), "windows")) //a hack
p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
- TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+ 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
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
}
//todo
@@ -171,7 +171,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
TQRect KexiDBComboBox::editorGeometry() const
{
TQRect r( TQStyle::visualRect(
- tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
+ style().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
//if ((height()-r.bottom())<6)
@@ -232,7 +232,7 @@ void KexiDBComboBox::setLabelPosition(LabelPosition position)
TQRect KexiDBComboBox::buttonGeometry() const
{
TQRect arrowRect(
- tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
+ style().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
return arrowRect;
@@ -509,7 +509,7 @@ TQSize KexiDBComboBox::sizeHint() const
const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
- d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+ d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 3058f02c..daff9ef9 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
m_datePickerPopupMenu->insertItem(m_datePicker);
btn->setPopup(m_datePickerPopupMenu);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
- tqlayout->addWidget(m_edit, 1);
- tqlayout->addWidget(btn, 0);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
+ layout->addWidget(m_edit, 1);
+ layout->addWidget(btn, 0);
setFocusProxy(m_edit);
}
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 629a4bca..627e1172 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
m_datePickerPopupMenu->insertItem(m_datePicker);
btn->setPopup(m_datePickerPopupMenu);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
- tqlayout->addWidget(m_dateEdit, 0);
- tqlayout->addWidget(btn, 0);
- tqlayout->addWidget(m_timeEdit, 0);
- //tqlayout->addStretch(1);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
+ layout->addWidget(m_dateEdit, 0);
+ layout->addWidget(btn, 0);
+ layout->addWidget(m_timeEdit, 0);
+ //layout->addStretch(1);
setFocusProxy(m_dateEdit);
}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5b8b2939..dd52f9f5 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction()
void KexiDBImageBox::handleCopyAction()
{
- tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
+ tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
}
void KexiDBImageBox::handlePasteAction()
{
if (isReadOnly() || (!m_designMode && !hasFocus()))
return;
- TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+ TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
// if (!pm.isNull())
// setValueInternal(pm, true);
if (dataSource().isEmpty()) {
@@ -610,7 +610,7 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
}
if (!m_paletteBackgroundColorChanged && parentWidget()) {
KexiFrame::setPaletteBackgroundColor(
- dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+ dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() );
}
}
@@ -685,9 +685,9 @@ 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())) {
- tqstyle().tqdrawPrimitive(
- TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this),
- tqpalette().active() );
+ style().tqdrawPrimitive(
+ TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this),
+ palette().active() );
}
}
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index adb833fa..93f35027 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -424,7 +424,7 @@ void KexiDBLabel::init()
m_hasFocusableWidget = false;
d->internalLabel = new KexiDBInternalLabel( this );
d->internalLabel->hide();
- d->frameColor = tqpalette().active().foreground();
+ d->frameColor = palette().active().foreground();
setAlignment( d->internalLabel->alignment() );
}
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index 09266ae4..b64d6edf 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
, d( new Private() )
{
//defaults
- d->frameColor = tqpalette().active().foreground();
+ d->frameColor = palette().active().foreground();
//! @todo obtain these defaults from current template's style...
setLineWidth(2);
setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised);
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index f3347676..37e30e04 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
}
if (copyToClipboard)
- kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+ kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
delete [] isText;
delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 94642d38..4a11d1d7 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
}
}
-void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
{
- TQWizard::layOutButtonRow( tqlayout );
+ TQWizard::layOutButtonRow( layout );
- //find the last subtqlayout
+ //find the last sublayout
TQLayout *l = 0;
- for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
- l = lit.current()->tqlayout();
+ for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
+ l = lit.current()->layout();
if (dynamic_cast<TQBoxLayout*>(l)) {
if (!m_defaultsBtn) {
m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 27213159..7ef7020d 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard
protected:
//! reimplemented to add "Defaults" button on the left hand
- virtual void layOutButtonRow( TQHBoxLayout * tqlayout );
+ virtual void layOutButtonRow( TQHBoxLayout * layout );
//! \return default delimiter depending on mode.
TQString defaultDelimiter() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 69942a79..0e5f6e4c 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
if ( m_mode == Clipboard )
{
setCaption( i18n( "Inserting From Clipboard" ) );
- TQMimeSource * mime = TQApplication::tqclipboard()->data();
+ TQMimeSource * mime = TQApplication::clipboard()->data();
if ( !mime )
{
KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -336,11 +336,11 @@ if ( m_mode == Clipboard )
}
else if (m_mode == Clipboard) {
TQCString subtype("plain");
- m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard);
+ m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard);
/* debug
- for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++)
+ for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++)
kdDebug() << i << ": "
- << TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
+ << TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
*/
}
else {
@@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
if (x == '\r') {
continue; // eat '\r', to handle RFC-compliant files
}
- if (offset==0 && x.tqunicode()==0xfeff) {
+ if (offset==0 && x.unicode()==0xfeff) {
// Ignore BOM, the "Byte Order Mark"
- // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf)
+ // (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
// Probably fixed in TQt4.
continue;
}
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 3c420c7a..76f76d31 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget
setFileName() can be used to display filename and setCommentAfterFileName() to display
additional comment.
- The widget's tqlayout can look like this:
+ The widget's layout can look like this:
\pre [icon] [labeltext] [filename] [comment]
*/
diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
index 2f6ee825..5406e8ca 100644
--- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp
@@ -158,9 +158,9 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
) );
// Create the tableview.
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
d->datatable = new KexiDataTable(mainWin(), this, "Macro KexiDataTable", false /*not db aware*/);
- tqlayout->addWidget(d->datatable);
+ layout->addWidget(d->datatable);
d->tableview = d->datatable->tableView();
d->tableview->setSpreadSheetMode();
d->tableview->setColumnStretchEnabled( true, COLUMN_ID_COMMENT ); //last column occupies the rest of the area
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 26bd964d..05d7ba72 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -154,7 +154,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index e3599b22..489640a2 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -349,7 +349,7 @@ class EditListBoxItem : public ListBoxItem
Q_ASSERT( m_widget != 0 );
//m_widget->reparent(listBox()->viewport(), 0, TQPoint(0,0));
m_widget->reparent(listBox(), 0, TQPoint(1,1));
- //tqlayout->addWidget(m_widget, 1);
+ //layout->addWidget(m_widget, 1);
m_widget->setMinimumHeight(5);
m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
}
@@ -507,7 +507,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
{
kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl;
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, 0);
+ TQHBoxLayout* layout = new TQHBoxLayout(this, 0, 0);
d->macroproperty = dynamic_cast<KexiMacroProperty*>( property->customProperty() );
if(! d->macroproperty) {
@@ -516,7 +516,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
}
d->combobox = new KComboBox(this);
- tqlayout->addWidget(d->combobox);
+ layout->addWidget(d->combobox);
d->listbox = new ListBox(d->combobox, d->macroproperty);
d->combobox->setEditable(true);
d->combobox->setListBox(d->listbox);
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index d7f3801e..540dcc39 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -45,11 +45,11 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent,
: KexiMacroView(mainwin, parent, macro, "KexiMacroTextView")
, d( new Private() )
{
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
d->editor = new KTextEdit(this);
d->editor->setTextFormat(TQt::PlainText);
d->editor->setWordWrap(TQTextEdit::NoWrap);
- tqlayout->addWidget(d->editor);
+ layout->addWidget(d->editor);
connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged()));
}
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index 080f8d08..01a3ee3c 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -82,7 +82,7 @@
</spacer>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -105,7 +105,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index e7526413..26b7d0f2 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -53,7 +53,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index cfd38e3a..1b4a3301 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -1074,7 +1074,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
// return false;
// }
if (xml.isEmpty()) {
- //in a case when query tqlayout was not saved, build tqlayout by hand
+ //in a case when query layout was not saved, build layout by hand
// -- dynamic cast because of a need for handling invalid queries
// (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h
index 1102b1d9..f85125c6 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.h
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h
@@ -134,10 +134,10 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase
void slotAboutConnectionRemove(KexiRelationViewConnection*);
void slotTableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName );
- /*! Loads tqlayout of relation GUI diagram. */
+ /*! Loads layout of relation GUI diagram. */
bool loadLayout();
- /*! Stores tqlayout of relation GUI diagram. */
+ /*! Stores layout of relation GUI diagram. */
bool storeLayout();
void showTablesForQuery(KexiDB::QuerySchema *query);
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 43353b84..5de13fe2 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -124,14 +124,14 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
d->pixmapStatus->setFixedWidth(d->statusPixmapOk.width()*3/2);
d->pixmapStatus->setAlignment(AlignHCenter | AlignTop);
d->pixmapStatus->setMargin(d->statusPixmapOk.width()/4);
- d->pixmapStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+ d->pixmapStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
d->lblStatus = new TQLabel(d->status_hbox);
d->lblStatus->setAlignment(AlignLeft | AlignTop | WordBreak);
d->lblStatus->setMargin(d->statusPixmapOk.width()/4);
d->lblStatus->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
d->lblStatus->resize(d->lblStatus->width(),d->statusPixmapOk.width()*3);
- d->lblStatus->setPaletteBackgroundColor( tqpalette().active().color(TQColorGroup::Base) );
+ d->lblStatus->setPaletteBackgroundColor( palette().active().color(TQColorGroup::Base) );
TQHBoxLayout *b = new TQHBoxLayout(this);
b->addWidget(d->splitter);
@@ -449,7 +449,7 @@ KexiQueryDesignerSQLView::storeNewData(const KexiDB::SchemaData& sdata, bool &ca
{
Q_UNUSED( cancel );
- //here: we won't store query tqlayout: it will be recreated 'by hand' in GUI Query Editor
+ //here: we won't store query layout: it will be recreated 'by hand' in GUI Query Editor
bool queryOK = slotCheckQuery();
bool ok = true;
KexiDB::SchemaData* query = 0;
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index e53e876c..4fea781e 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -180,7 +180,7 @@ KexiQueryDesignerSQLHistory::slotToClipboard()
if(!m_selected)
return;
- TQApplication::tqclipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
+ TQApplication::clipboard()->setText(m_selected->statement(), TQClipboard::Clipboard);
}
void
diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
index 74723bc3..00b5a21d 100644
--- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
@@ -139,7 +139,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
data->password = config.readEntry("encryptedPassword");
uint len = data->password.length();
for (uint i=0; i<len; i++)
- data->password[i] = TQChar( data->password[i].tqunicode() - 47 - i );
+ data->password[i] = TQChar( data->password[i].unicode() - 47 - i );
}
if(data->password.isEmpty())
data->password = config.readEntry("password");
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index ed3b99e2..d44c59b9 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -73,8 +73,8 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
TQSplitter* splitter = new TQSplitter(this);
splitter->setOrientation(Qt::Vertical);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
- tqlayout->addWidget(splitter);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
+ layout->addWidget(splitter);
d->editor = new KexiScriptEditor(mainWin, splitter, "ScriptEditor");
splitter->setFocusProxy(d->editor);
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 6f75bdea..f244ae39 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -93,10 +93,10 @@ def runGuiApp(copycenter, name):
qt.QDialog.__init__(self, parent, "ProgressDialog", 1)
self.parent = parent
self.setCaption(caption)
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setMargin(2)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
self.listview = qt.QListView(box)
self.listview.setAllColumnsShowFocus(True)
self.listview.header().setStretchEnabled(True,0)
@@ -216,7 +216,7 @@ def runGuiApp(copycenter, name):
print "CopyJobWidget.writeOptions"
writer.write("<%s plugin=\"%s\">\n" % (plugininst.plugintype, pluginname))
for optionname in plugininst.options:
- value = self.escape( tqunicode(plugininst.options[optionname]).encode("utf-8") )
+ value = self.escape( unicode(plugininst.options[optionname]).encode("utf-8") )
writer.write("\t<%s value=\"%s\" />\n" % (optionname,value))
writer.write("</%s>\n" % plugininst.plugintype)
@@ -309,31 +309,31 @@ def runGuiApp(copycenter, name):
self.starttime = None
qt.QDialog.__init__(self, dialog, "ProgressDialog", 1)
self.setCaption("Copying...")
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setSpacing(6)
box.setMargin(6)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
self.textbrowser = qt.QTextBrowser(box)
self.textbrowser.setWordWrap(qt.QTextEdit.WidgetWidth)
self.textbrowser.setTextFormat(qt.Qt.RichText)
statusbox = qt.QFrame(box)
- tqlayout = qt.QGridLayout(statusbox,4,2,0,2)
- tqlayout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
+ layout = qt.QGridLayout(statusbox,4,2,0,2)
+ layout.addWidget(qt.QLabel("Number of records done:",statusbox),0,0)
self.donecounter = 0
self.donelabel = qt.QLabel("-",statusbox)
- tqlayout.addWidget(self.donelabel,0,1)
- tqlayout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
+ layout.addWidget(self.donelabel,0,1)
+ layout.addWidget(qt.QLabel("Successfully copied records:",statusbox),1,0)
self.successcounter = 0
self.successlabel = qt.QLabel("-",statusbox)
- tqlayout.addWidget(self.successlabel,1,1)
- tqlayout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
+ layout.addWidget(self.successlabel,1,1)
+ layout.addWidget(qt.QLabel("Failed to copy records:",statusbox),2,0)
self.failedcounter = 0
self.failedlabel = qt.QLabel("-",statusbox)
- tqlayout.addWidget(self.failedlabel,2,1)
- tqlayout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
+ layout.addWidget(self.failedlabel,2,1)
+ layout.addWidget(qt.QLabel("Elapsed time in seconds:",statusbox),3,0)
self.elapsedlabel = qt.QLabel("-",statusbox)
- tqlayout.addWidget(self.elapsedlabel,3,1)
+ layout.addWidget(self.elapsedlabel,3,1)
btnbox = qt.QHBox(box)
btnbox.setSpacing(6)
self.donebtn = qt.QPushButton(btnbox)
@@ -530,11 +530,11 @@ def runGuiApp(copycenter, name):
self.ListViewDialog = ListViewDialog
qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
self.setCaption("Copy Center")
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setMargin(6)
box.setSpacing(6)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
self.tab = qt.QTabWidget(box)
self.tab.setMargin(6)
box.setStretchFactor(self.tab,1)
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
index 678cf40b..985d757d 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py
@@ -84,7 +84,7 @@ class CopyCenterPlugin:
return None
record = []
for fieldname in self.fieldlist:
- record.append( tqunicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
+ record.append( unicode(self.cursor.value(fieldname).toString()).encode("latin-1") )
#print "read record: %s" % record
return record
@@ -145,8 +145,8 @@ class CopyCenterPlugin:
cursorrecord.setValue(self.fieldlist[i], v)
rowcount = self.cursor.insert()
if rowcount < 1:
- drv = tqunicode(self.cursor.lastError().driverText()).encode("latin-1")
- db = tqunicode(self.cursor.lastError().databaseText()).encode("latin-1")
+ drv = unicode(self.cursor.lastError().driverText()).encode("latin-1")
+ db = unicode(self.cursor.lastError().databaseText()).encode("latin-1")
print "failed: %s %s" % (drv,db)
self.copierer.writeFailed(record)
else:
diff --git a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
index 6ca94f9a..200b3dee 100755
--- a/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
+++ b/kexi/plugins/scripting/scripts/importxhtml/ImportXHTML.py
@@ -124,9 +124,9 @@ class SaxInput:
was parsed. """
if self.field != None:
- # the xml-data is tqunicode and we need to encode it
+ # the xml-data is unicode and we need to encode it
# to latin-1 cause KexiDB deals only with latin-1.
- u = tqunicode(chars[offset:offset+length])
+ u = unicode(chars[offset:offset+length])
self.field.append(u.encode("latin-1"))
# start the job
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 0155ed87..55cd5a1c 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -296,7 +296,7 @@ bool AlterTableTester::showSchema(KexiDialogBase* dlg, bool copyToClipboard)
if (!getSchemaDump(dlg, schemaDebugString))
return false;
if (copyToClipboard)
- TQApplication::tqclipboard()->setText( schemaDebugString );
+ TQApplication::clipboard()->setText( schemaDebugString );
else
kdDebug() << TQString("Schema for '%1' table:\n").arg(dlg->partItem()->name())
+ schemaDebugString + "\nendSchema" << endl;
@@ -379,7 +379,7 @@ bool AlterTableTester::showActions(KexiDialogBase* dlg, bool copyToClipboard)
if (!getActionsDump(dlg, actionsDebugString))
return false;
if (copyToClipboard)
- TQApplication::tqclipboard()->setText( actionsDebugString );
+ TQApplication::clipboard()->setText( actionsDebugString );
else
kdDebug() << TQString("Simplified actions for altering table '%1':\n").arg(dlg->partItem()->name())
+ actionsDebugString+"\n" << endl;
@@ -439,7 +439,7 @@ bool AlterTableTester::showTableData(KexiDialogBase* dlg, bool copyToClipboard)
if (!getTableDataDump(dlg, dataString))
return false;
if (copyToClipboard)
- TQApplication::tqclipboard()->setText( dataString );
+ TQApplication::clipboard()->setText( dataString );
else
kdDebug() << TQString("Contents of table '%1':\n").arg(dlg->partItem()->name())+dataString+"\n" << endl;
return true;
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index a5ece575..bf5fcd32 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -231,7 +231,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="4" rowspan="8" colspan="1">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index 1f9006fd..aabd7cc2 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -225,7 +225,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
: KTabWidget( parent, name )
{
mainWidget = new KexiDBConnectionWidget( this, "mainWidget" );
- mainWidget->tqlayout()->setMargin(KDialog::marginHint());
+ mainWidget->layout()->setMargin(KDialog::marginHint());
addTab( mainWidget, i18n("Parameters") );
// TQVBox *page2 = new TQVBox(this);
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index 02fe2853..d121f1b7 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="3" colspan="1">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -395,7 +395,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 74b4326d..46d2dfac 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -40,7 +40,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -125,7 +125,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 07627f32..121ee8dd 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
: KexiViewBase(mainWin, parent, name)
, d(new KexiEditorPrivate())
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
#ifdef KTEXTEDIT_BASED_SQL_EDITOR
d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
//adjust font
@@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
#else
TQFrame *fr = new TQFrame(this);
fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel);
- tqlayout->addWidget(fr);
- tqlayout = new TQVBoxLayout(fr);
- tqlayout->setMargin( 2 );
+ layout->addWidget(fr);
+ layout = new TQVBoxLayout(fr);
+ layout->setMargin( 2 );
d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr));
if (!d->doc)
@@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view));
d->view->installEventFilter(this);
- tqlayout->addWidget(d->view);
+ layout->addWidget(d->view);
setViewWidget(d->view, true/*focus*/);
d->view->show();
}
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index 04beace6..ba4c8f9e 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -53,7 +53,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
viewport()->setPaletteBackgroundColor(colorGroup().mid());
- TQColor fc = tqpalette().active().foreground(),
+ TQColor fc = palette().active().foreground(),
bc = viewport()->paletteBackgroundColor();
m_helpColor = KexiUtils::blendedColors(fc, bc, 1, 2);
// m_helpColor = TQColor((fc.red()+bc.red()*2)/3, (fc.green()+bc.green()*2)/3,
@@ -345,7 +345,7 @@ KexiScrollView::drawContents( TQPainter * p, int clipx, int clipy, int clipw, in
//draw right and bottom borders
const int wx = childX(m_widget);
const int wy = childY(m_widget);
- p->setPen(tqpalette().active().foreground());
+ p->setPen(palette().active().foreground());
p->drawLine(wx+m_widget->width(), wy, wx+m_widget->width(), wy+m_widget->height());
p->drawLine(wx, wy+m_widget->height(), wx+m_widget->width(), wy+m_widget->height());
//kdDebug() << "KexiScrollView::drawContents() " << wy+m_widget->height() << endl;
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 65286fbd..cbd48e84 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -115,9 +115,9 @@ void KexiSectionHeader::slotFocus(bool in)
{
in = in || focusWidget()==this;
d->lbl->setPaletteBackgroundColor(
- in ? tqpalette().active().color(TQColorGroup::Highlight) : tqpalette().active().color(TQColorGroup::Background) );
+ in ? palette().active().color(TQColorGroup::Highlight) : palette().active().color(TQColorGroup::Background) );
d->lbl->setPaletteForegroundColor(
- in ? tqpalette().active().color(TQColorGroup::HighlightedText) : tqpalette().active().color(TQColorGroup::Foreground) );
+ in ? palette().active().color(TQColorGroup::HighlightedText) : palette().active().color(TQColorGroup::Foreground) );
}
TQSize KexiSectionHeader::sizeHint() const
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 237130f2..ab703923 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -70,7 +70,7 @@ void KexiSmallToolButton::updateAction()
void KexiSmallToolButton::init()
{
- setPaletteBackgroundColor(tqpalette().active().background());
+ setPaletteBackgroundColor(palette().active().background());
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
TQFont f(KGlobalSettings::toolBarFont());
f.setPixelSize(Kexi::smallFont().pixelSize());
@@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
- tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+ style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
TQRect(width()-7, height()-7, 5, 5), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index cee4f360..c03d16e2 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
setInitialSize(TQSize(400, 200), true);
//// Setup the icon toolbar /////////////////
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3);
TQToolButton *newItemPath = new TQToolButton(frame);
newItemPath->setIconSet(BarIconSet("fileopen"));
newItemPath->setTextLabel(i18n("&Add File"), true);
- vtqlayout->addWidget(newItemPath);
+ vlayout->addWidget(newItemPath);
m_buttons.insert(BNewItemPath, newItemPath);
connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
TQToolButton *newItemName = new TQToolButton(frame);
newItemName->setIconSet(BarIconSet("icons"));
newItemName->setTextLabel(i18n("&Add an Icon"), true);
- vtqlayout->addWidget(newItemName);
+ vlayout->addWidget(newItemName);
m_buttons.insert(BNewItemName, newItemName);
connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
TQToolButton *delItem = new TQToolButton(frame);
delItem->setIconSet(BarIconSet("edit_remove"));
delItem->setTextLabel(i18n("&Remove Selected Item"), true);
- vtqlayout->addWidget(delItem);
+ vlayout->addWidget(delItem);
m_buttons.insert(BDelItem, delItem);
connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
- vtqlayout->addStretch();
+ vlayout->addStretch();
// Setup the iconView
m_iconView = new KIconView(frame, "pixcollection_iconView");
diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp
index ab3f1ac4..fe3b5a53 100644
--- a/kexi/widget/relations/kexirelationviewconnection.cpp
+++ b/kexi/widget/relations/kexirelationviewconnection.cpp
@@ -67,7 +67,7 @@ KexiRelationViewConnection::~KexiRelationViewConnection()
void
KexiRelationViewConnection::drawConnection(TQPainter *p)
{
- p->setPen(m_parent->tqpalette().active().foreground());
+ p->setPen(m_parent->palette().active().foreground());
int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX();
int sy = m_masterTable->globalY(m_masterField);
int rx = m_detailsTable->x() + m_parent->contentsX();
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index b40b9761..ce94a809 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
{
if (painter) {
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+ style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
TQStyle::Style_FocusAtBorder);
}
return itemRect(item);
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index c818606d..1218a978 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -309,14 +309,14 @@ void KexiBlobTableEdit::executeCopyAction(const TQByteArray& data)
TQPixmap pixmap;
if (!pixmap.loadFromData(data))
return;
- tqApp->tqclipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
+ tqApp->clipboard()->setPixmap(pixmap, TQClipboard::Clipboard);
}
void KexiBlobTableEdit::handlePasteAction()
{
if (isReadOnly())
return;
- TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+ TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
TQByteArray ba;
TQBuffer buffer( ba );
buffer.open( IO_WriteOnly );
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index c0753269..c4067dfd 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -135,7 +135,7 @@ void KexiBoolTableEdit::handleAction(const TQString& actionName)
if (actionName=="edit_paste") {
emit editRequested();
bool ok;
- const int value = tqApp->tqclipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
+ const int value = tqApp->clipboard()->text( TQClipboard::Clipboard ).toInt(&ok);
if (ok) {
m_currentValue = (value==0) ? TQVariant(false, 0) : TQVariant(true, 1);
}
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index f45eb0e2..308e565e 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -84,7 +84,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
// }
// setView( m_lineedit );
-// tqlayout->addWidget(m_view);
+// layout->addWidget(m_view);
// m_combo->setEditable( true );
// m_combo->clear();
// m_combo->insertStringList(f.enumHints());
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
m_lineedit->clear();
}
//! @todo does not work with BLOBs!
- setValueInInternalEditor( tqApp->tqclipboard()->text() );
+ setValueInInternalEditor( tqApp->clipboard()->text() );
}
else
KexiInputTableEdit::handleAction(actionName);
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index e531b814..b082bd95 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -101,7 +101,7 @@ void KexiTableEdit::resize(int w, int h)
{
TQWidget::resize(w, h);
if (m_view) {
- if (!tqlayout()) { //if there is tqlayout (eg. KexiInputTableEdit), resize is automatic
+ if (!layout()) { //if there is layout (eg. KexiInputTableEdit), resize is automatic
m_view->move(0,0);
m_view->resize(w, h);
}
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index fc488c83..b602168a 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -504,7 +504,7 @@ protected:
*value is set to the default value. */
bool isDefaultValueDisplayed(KexiTableItem *item, int col, TQVariant* value = 0);
- //! painting and tqlayout
+ //! painting and layout
void drawContents(TQPainter *p, int cx, int cy, int cw, int ch);
void createBuffer(int width, int height);
void paintCell(TQPainter* p, KexiTableItem *item, int col, int row, const TQRect &cr, bool print=false);
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index 6a15b0db..a4e45daf 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -509,8 +509,8 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
const TQString &as = m_leftTmp.toString();
const TQString &bs = m_rightTmp.toString();
- const TQChar *a = as.tqunicode();
- const TQChar *b = bs.tqunicode();
+ const TQChar *a = as.unicode();
+ const TQChar *b = bs.unicode();
if ( a == b )
return 0;
@@ -524,16 +524,16 @@ int KexiTableViewData::cmpStr(Item item1, Item item2)
int l=TQMIN(as.length(),bs.length());
- au = a->tqunicode();
- bu = b->tqunicode();
+ au = a->unicode();
+ bu = b->unicode();
au = (au <= 0x17e ? charTable[au] : 0xffff);
bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
while (l-- && au == bu)
{
a++,b++;
- au = a->tqunicode();
- bu = b->tqunicode();
+ au = a->unicode();
+ bu = b->unicode();
au = (au <= 0x17e ? charTable[au] : 0xffff);
bu = (bu <= 0x17e ? charTable[bu] : 0xffff);
}
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index d217337b..cab7f791 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -34,7 +34,7 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
: KexiUtils::StyleProxy(parentStyle)
{
- setBackgroundColor( widget->tqpalette().active().background() );
+ setBackgroundColor( widget->palette().active().background() );
}
~KexiTableViewHeaderStyle() {}
@@ -65,7 +65,7 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
, m_selectedSection(-1)
, m_styleChangeEnabled(true)
{
- styleChange( tqstyle() );
+ styleChange( style() );
installEventFilter(this);
connect(this, TQT_SIGNAL(sizeChange(int,int,int)),
this, TQT_SLOT(slotSizeChange(int,int,int)));
@@ -81,7 +81,7 @@ void KexiTableViewHeader::styleChange( TQStyle& oldStyle )
if (!m_styleChangeEnabled)
return;
m_styleChangeEnabled = false;
- setStyle( new KexiTableViewHeaderStyle(&tqApp->tqstyle(), this) );
+ setStyle( new KexiTableViewHeaderStyle(&tqApp->style(), this) );
m_styleChangeEnabled = true;
}
@@ -126,7 +126,7 @@ bool KexiTableViewHeader::eventFilter(TQObject * watched, TQEvent * e)
TQString tip = m_toolTips[ section ];
if (tip.isEmpty()) { //try label
TQFontMetrics fm(font());
- int minWidth = fm.width( label( section ) ) + tqstyle().pixelMetric( TQStyle::PM_HeaderMargin );
+ int minWidth = fm.width( label( section ) ) + style().pixelMetric( TQStyle::PM_HeaderMargin );
TQIconSet *iset = iconSet( section );
if (iset)
minWidth += (2+iset->pixmap( TQIconSet::Small, TQIconSet::Normal ).width()); //taken from TQHeader::sectionSizeHint()
@@ -186,16 +186,16 @@ void KexiTableViewHeader::paintSection( TQPainter * p, int index, const TQRect &
{
const bool paintSelection = index==m_selectedSection && index != -1;
if (paintSelection) {
- static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
+ static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
KexiUtils::blendedColors(
- tqpalette().active().background(), m_selectionBackgroundColor, 2, 1) );
+ palette().active().background(), m_selectionBackgroundColor, 2, 1) );
}
TQHeader::paintSection( p, index, fr );
if (paintSelection) { //revert the color for subsequent paints
- static_cast<KexiTableViewHeaderStyle&>(tqstyle()).setBackgroundColor(
- tqpalette().active().background());
+ static_cast<KexiTableViewHeaderStyle&>(style()).setBackgroundColor(
+ palette().active().background());
}
}
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index fa5c35ab..6279aa04 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete )
void KexiArrowTip::drawContents(TQPainter& p)
{
- p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+ p.setPen( TQPen(palette().active().foreground(), 1) );
p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight),
TQt::AlignCenter, m_value.toString());
}
void KexiArrowTip::drawFrame(TQPainter& p)
{
- TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+ TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
p.setPen( pen );
/*
/\
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 60f99f85..5e0b7ab8 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -34,7 +34,7 @@ KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent )
m_paintedCombo->setEditable(true);
setToggleButton(true);
- styleChange(tqstyle());
+ styleChange(style());
m_paintedCombo->move(0,0);
m_paintedCombo->setFixedSize(size());
}
@@ -58,30 +58,30 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
m_paintedCombo->move(0,0);
m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
}
- tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p,
+ style().drawComplexControl( TQStyle::CC_ComboBox, p,
m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(),
flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None );
}
else {
r.setWidth(r.width()+2);
- tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+ style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
}
}
void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
{
//<hack>
- if (qstricmp(tqstyle().name(),"thinkeramik")==0) {
+ if (qstricmp(style().name(),"thinkeramik")==0) {
m_fixForHeight = 3;
}
else
m_fixForHeight = 0;
//</hack>
m_drawComplexControl =
- (tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
- || qstricmp(tqstyle().name(),"platinum")==0;
+ (style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0)
+ || qstricmp(style().name(),"platinum")==0;
if (m_fixForHeight==0)
- setFixedWidth( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox,
+ setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox,
(const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 );
KPushButton::styleChange(oldStyle);
}
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 1943b086..0866cf65 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,7 +92,7 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
{
- textColor = w->tqpalette().active().foreground();
+ textColor = w->palette().active().foreground();
selectedTextColor = w->tqpalette().active().highlightedText();
font = w->font();
}
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 054192ce..0710b4d0 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -33,10 +33,10 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
// setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
int fixedWidth;
//hack
- if (qstricmp(tqstyle().name(),"thinkeramik")==0)
+ if (qstricmp(style().name(),"thinkeramik")==0)
fixedWidth = 18; //typical width as in "windows" style
else
- fixedWidth = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox,
+ fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox,
this, TQStyle::SC_ComboBoxArrow ).width();
setFixedWidth( fixedWidth );
setPopupDelay(10/*ms*/);
@@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
arrowFlags |= TQStyle::Style_Down;
if (isEnabled())
arrowFlags |= TQStyle::Style_Enabled;
- tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+ style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index f6868a5e..e2397ede 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent()
return (m_idx < (int)count()) ? m_list->take(m_idx) : 0;
}
-//// The tqlayout itself
+//// The layout itself
KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
: TQLayout(parent, border, space, name)
@@ -182,8 +182,8 @@ KexiFlowLayout::sizeHint() const
TQSize
KexiFlowLayout::minimumSize() const
{
-//js: do we really need to simulate tqlayout here?
-// I commented this out because it was impossible to stretch tqlayout conveniently.
+//js: do we really need to simulate layout here?
+// I commented this out because it was impossible to stretch layout conveniently.
// Now, minimum size is computed automatically based on item's minimumSize...
#if 0
if(m_cached_minSize.isEmpty()) {
@@ -246,7 +246,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
// kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
if ((x + oSizeHint.width()) > r.right() && h > 0) {
- // do the tqlayout of current line
+ // do the layout of current line
TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item;
int wx = r.x();
@@ -298,7 +298,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
++it;
}
- // don't forget to tqlayout the last line
+ // don't forget to layout the last line
TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item;
int wx = r.x();
@@ -362,7 +362,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
if (y + oSizeHint.height() > r.bottom() && w > 0) {
- // do the tqlayout of current line
+ // do the layout of current line
TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item;
int wy = r.y();
@@ -414,7 +414,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
++it;
}
- // don't forget to tqlayout the last line
+ // don't forget to layout the last line
TQPtrListIterator<TQLayoutItem> it2(currentLine);
TQLayoutItem *item;
int wy = r.y();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index aec6c6c3..c23398e0 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqptrlist.h>
-//! @short a special "flow" tqlayout
+//! @short a special "flow" layout
class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
{
public:
@@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
~KexiFlowLayout();
- /*! \return the widgets in the order of the tqlayout,
+ /*! \return the widgets in the order of the layout,
ie as it is stored in m_list. You must delete the list after using it. */
TQPtrList<TQWidget>* widgetList() const;
- /*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */
+ /*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
void setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
- /*! \return tqlayout's orientation. */
+ /*! \return layout's orientation. */
Qt::Orientation orientation() const { return m_orientation; }
void setJustified(bool justify) { m_justify = justify; }
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index e3e281e3..a2d6b3d6 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -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);
- tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+ style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()),
TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
}
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index ad55774e..2a36ef09 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev )
void KexiToolTip::drawFrame(TQPainter& p)
{
- p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+ p.setPen( TQPen(palette().active().foreground(), 1) );
p.drawRect(rect());
}