diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 9c9e034..773b4e1 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -59,9 +59,9 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
topLayout->addWidget(textLabel2);
resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
- TQVBoxLayout*ptqlayout = new TQVBoxLayout(resolutionGroupBox);
+ TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox);
TQScrollView* sv = new TQScrollView(resolutionGroupBox);
- ptqlayout->addWidget(sv);
+ playout->addWidget(sv);
sv->setResizePolicy(TQScrollView::AutoOneFit);
sv->setHScrollBarMode(TQScrollView::AlwaysOff);
sv->setMargin(5);
diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc
index d726d72..b174e24 100644
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@@ -479,7 +479,7 @@ void AddressWidget::slotCreateNewRecord()
KMessageBox::sorry(this,
i18n("You cannot add addresses to the address book "
"until you have done a HotSync at least once "
- "to retrieve the database tqlayout from your Pilot."),
+ "to retrieve the database layout from your Pilot."),
i18n("Cannot Add New Address"));
if (myDB)
diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc
index ef9e3e8..2d79624 100644
--- a/kpilot/conduitConfigDialog.cc
+++ b/kpilot/conduitConfigDialog.cc
@@ -252,7 +252,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
i18n("This conduit appears to be broken and cannot "
"be configured."));
- // Second page, now with tqlayout in a single column
+ // Second page, now with layout in a single column
//
// Probably deprecated.
//
diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc
index 056dac6..1b6ac32 100644
--- a/kpilot/dbRecordEditor.cc
+++ b/kpilot/dbRecordEditor.cc
@@ -141,9 +141,9 @@ void DBRecordEditor::initWidgets()
fFlagsGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
(TQSizePolicy::SizeType)4, 0, 0, fFlagsGroup->sizePolicy().hasHeightForWidth() ) );
fFlagsGroup->setColumnLayout(0, Qt::Vertical );
- fFlagsGroup->tqlayout()->setSpacing( 6 );
- fFlagsGroup->tqlayout()->setMargin( 11 );
- fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() );
+ fFlagsGroup->layout()->setSpacing( 6 );
+ fFlagsGroup->layout()->setMargin( 11 );
+ fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->layout() );
fFlagsGroupLayout->setAlignment( TQt::AlignTop );
fDirty = new TQCheckBox( fFlagsGroup, "fDirty" );
diff --git a/kpilot/internalEditorAction.cc b/kpilot/internalEditorAction.cc
index 5dbf75a..d33eb6f 100644
--- a/kpilot/internalEditorAction.cc
+++ b/kpilot/internalEditorAction.cc
@@ -214,35 +214,35 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
TQWidget*page=new TQWidget(resdlg);
resdlg->setMainWidget(page);
- TQGridLayout*tqlayout = new TQGridLayout( page, 1, 1);
+ TQGridLayout*layout = new TQGridLayout( page, 1, 1);
TQLabel *label=new TQLabel(dialogText, page);
label->setAlignment( TQLabel::WordBreak );
- tqlayout->addMultiCellWidget( label, 0,0, 0,1 );
+ layout->addMultiCellWidget( label, 0,0, 0,1 );
- tqlayout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum,
+ layout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum,
TQSizePolicy::Fixed ), 1, 0 );
if (knownDB)
{
label=new TQLabel(i18n("Entry in KPilot"), page);
- tqlayout->addWidget( label, 2,0);
+ layout->addWidget( label, 2,0);
KTextEdit*textBrowser = new KTextEdit(CSL1("")+localEntry+CSL1(""), TQString(), page);
textBrowser->setReadOnly(true);
- tqlayout->addWidget( textBrowser, 3,0);
+ layout->addWidget( textBrowser, 3,0);
label=new TQLabel(i18n("Entry on Handheld"), page);
- tqlayout->addWidget( label, 2,1);
+ layout->addWidget( label, 2,1);
textBrowser = new KTextEdit(CSL1("")+serialEntry+CSL1(""), TQString(), page);
textBrowser->setReadOnly(true);
- tqlayout->addWidget( textBrowser, 3,1);
+ layout->addWidget( textBrowser, 3,1);
}
else
{
label=new TQLabel(i18n("Entry in KPilot"), page);
- tqlayout->addMultiCellWidget( label, 2,2,0,1);
+ layout->addMultiCellWidget( label, 2,2,0,1);
// directly display the record's data:
TQWidget *hexEdit = KHE::createBytesEditWidget( page, "LocalBufferEdit" );
@@ -267,10 +267,10 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW;
}
- tqlayout->addMultiCellWidget( hexEdit, 3,3,0,1);
+ layout->addMultiCellWidget( hexEdit, 3,3,0,1);
label=new TQLabel(i18n("Entry on Handheld"), page);
- tqlayout->addMultiCellWidget( label, 4,4,0,1);
+ layout->addMultiCellWidget( label, 4,4,0,1);
// directly display the record's data:
hexEdit = KHE::createBytesEditWidget( page, "SerialBufferEdit" );
@@ -295,7 +295,7 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW;
}
- tqlayout->addMultiCellWidget( hexEdit, 5,5,0,1);
+ layout->addMultiCellWidget( hexEdit, 5,5,0,1);
}
int res=resdlg->exec();
diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc
index 2493386..e131613 100644
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@@ -99,7 +99,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" );
fStatusGroup->setColumnLayout(0, Qt::Vertical );
- fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() );
+ fStatusGroupLayout = new TQGridLayout( fStatusGroup->layout() );
fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
fStatus->setAlignment( TQLabel::WordBreak );
@@ -113,7 +113,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fResultsGroup = new TQGroupBox( i18n( "Detected Values" ), mainWidget, "fResultsGroup" );
fResultsGroup->setEnabled( FALSE );
fResultsGroup->setColumnLayout(0, Qt::Vertical );
- fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() );
+ fResultsGroupLayout = new TQGridLayout( fResultsGroup->layout() );
fResultsGroupLayout->setAlignment( TQt::AlignTop );
fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" );
diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc
index e0b85dc..e717a9d 100644
--- a/kpilot/todoWidget.cc
+++ b/kpilot/todoWidget.cc
@@ -407,7 +407,7 @@ void TodoWidget::slotCreateNewRecord()
KMessageBox::sorry(this,
i18n("You cannot add to-dos to the to-do list "
"until you have done a HotSync at least once "
- "to retrieve the database tqlayout from your Pilot."),
+ "to retrieve the database layout from your Pilot."),
i18n("Cannot Add New To-do"));
if (myDB)
diff --git a/lib/options.h b/lib/options.h
index 6a643e9..d8dcc0c 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -155,7 +155,7 @@ KDE_EXPORT struct tm writeTm(const TQDateTime &dt);
KDE_EXPORT struct tm writeTm(const TQDate &dt);
-// Some tqlayout macros
+// Some layout macros
//
// SPACING is a generic distance between visual elements;
// 10 seems reasonably good even at high resolutions.
diff --git a/lib/pilotAddress.h b/lib/pilotAddress.h
index 40b5630..db0f18c 100644
--- a/lib/pilotAddress.h
+++ b/lib/pilotAddress.h
@@ -314,7 +314,7 @@ public:
protected:
// Get the pointers in cases where no conversion to
- // tqunicode is desired.
+ // unicode is desired.
//
const char *getFieldP(int field) const
{
diff --git a/lib/plugin.h b/lib/plugin.h
index b4eb59f..f1dbec8 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -70,8 +70,8 @@ namespace Pilot
* NB. The reason that this is a TQObject which needs to create a
* separate widget - instead of a TQWidget subclass - has to do with
* layouting. If you make the widget with designer then the easiest
-* thing to do is to use a grid tqlayout there. Making ConduitConfigBase
-* a TQWidget subclass would require an additional tqlayout here, which
+* thing to do is to use a grid layout there. Making ConduitConfigBase
+* a TQWidget subclass would require an additional layout here, which
* seems a little foolish.
*
*/