summaryrefslogtreecommitdiffstats
path: root/src/kvilib/tal
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/tal')
-rw-r--r--src/kvilib/tal/kvi_tal_listview.cpp54
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt3.h2
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt4.h2
-rw-r--r--src/kvilib/tal/kvi_tal_textedit_qt3.h2
-rw-r--r--src/kvilib/tal/kvi_tal_toolbar.cpp6
-rw-r--r--src/kvilib/tal/kvi_tal_wizard.cpp8
6 files changed, 37 insertions, 37 deletions
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index 68e69675..2d946a21 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -324,7 +324,7 @@
&& d->exclusive && d->exclusive->d
&& d->exclusive->d->exclusive == this)
d->exclusive->turnOffChild();
- d->exclusive = 0; // so the children won't try to access us.
+ d->exclusive = 0; // so the tqchildren won't try to access us.
delete d;
d = 0;
}
@@ -403,7 +403,7 @@
updateController(update, store);
} else {
- // if there are no children we simply set the CheckBoxController and update its parent
+ // if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState(s);
stateChange(state());
if (parent() && parent()->rtti() == 1
@@ -430,7 +430,7 @@
}
stateChange(state());
}
- repaint();
+ tqrepaint();
}
void KviTalCheckListItem::setCurrentState(ToggleState s)
@@ -479,7 +479,7 @@
return;
TQPoint pos;
- int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
+ int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (activatedPos(pos)) {
bool parentControl = false;
if (parent() && parent()->rtti() == 1 &&
@@ -551,13 +551,13 @@
case CheckBox:
setCurrentState(storedState(key));
stateChange(state());
- repaint();
+ tqrepaint();
break;
case CheckBoxController: {
KviTalListViewItem *item = firstChild();
int childCount = 0;
while (item) {
- // recursively calling restoreState for children of type CheckBox and CheckBoxController
+ // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
if (item->rtti() == 1 &&
(((KviTalCheckListItem*)item)->type() == CheckBox ||
((KviTalCheckListItem*)item)->type() == CheckBoxController)) {
@@ -572,7 +572,7 @@
else
updateController(false);
} else {
- // if there are no children we retrieve the CheckBoxController state directly.
+ // if there are no tqchildren we retrieve the CheckBoxController state directly.
setState(storedState(key), true, false);
}
}
@@ -622,7 +622,7 @@
if (update && controller) {
controller->updateController(update, store);
}
- repaint();
+ tqrepaint();
}
}
@@ -642,7 +642,7 @@
}
item = item->nextSibling();
}
- // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
+ // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
setStoredState(internalState() , key);
}
@@ -652,7 +652,7 @@
int h = height();
KviTalListView *lv = listView();
if (lv)
- h = qMax(lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
+ h = qMax(lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv),
h);
h = qMax(h, TQApplication::globalStrut().height());
setHeight(h);
@@ -666,7 +666,7 @@
if (myType == RadioButtonController && pixmap(0)) {
// r += 0;
} else {
- r += lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
+ r += lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4;
}
}
return qMax(r, TQApplication::globalStrut().width());
@@ -700,7 +700,7 @@
parentControl = true;
TQFontMetrics fm(lv->fontMetrics());
- int boxsize = lv->tqstyle()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
+ int boxsize = lv->tqstyle()->tqpixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
TQStyle::PM_CheckListButtonSize, 0, lv);
int marg = lv->itemMargin();
int r = marg;
@@ -782,7 +782,7 @@
(lv->rootIsDecorated() || myType == RadioButton ||
(myType == CheckBox && parentControl))) {
TQRect rect;
- int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
+ int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (lv->columnAlignment(0) == TQt::AlignCenter) {
TQFontMetrics fm(lv->font());
int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
@@ -1056,7 +1056,7 @@
&& d->exclusive && d->exclusive->d
&& d->exclusive->d->exclusive == this )
d->exclusive->turnOffChild();
- d->exclusive = 0; // so the children won't try to access us.
+ d->exclusive = 0; // so the tqchildren won't try to access us.
if ( d->statesDict )
delete d->statesDict;
delete d;
@@ -1137,7 +1137,7 @@
updateController( update, store );
} else {
- // if there are no children we simply set the CheckBoxController and update its parent
+ // if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState( s );
stateChange( state() );
if ( parent() && parent()->rtti() == 1
@@ -1164,7 +1164,7 @@
}
stateChange( state() );
}
- repaint();
+ tqrepaint();
}
void KviTalCheckListItem::setCurrentState( ToggleState s )
@@ -1216,7 +1216,7 @@
return;
TQPoint pos;
- int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( activatedPos( pos ) ) {
bool parentControl = FALSE;
if ( parent() && parent()->rtti() == 1 &&
@@ -1287,13 +1287,13 @@
case CheckBox:
setCurrentState( storedState( key ) );
stateChange( state() );
- repaint();
+ tqrepaint();
break;
case CheckBoxController: {
KviTalListViewItem *item = firstChild();
int childCount = 0;
while ( item ) {
- // recursively calling restoreState for children of type CheckBox and CheckBoxController
+ // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
if ( item->rtti() == 1 &&
( ((KviTalCheckListItem*)item)->type() == CheckBox ||
((KviTalCheckListItem*)item)->type() == CheckBoxController ) ) {
@@ -1308,7 +1308,7 @@
else
updateController( FALSE );
} else {
- // if there are no children we retrieve the CheckBoxController state directly.
+ // if there are no tqchildren we retrieve the CheckBoxController state directly.
setState( storedState( key ), TRUE, FALSE );
}
}
@@ -1358,7 +1358,7 @@
if ( update && controller ) {
controller->updateController( update, store );
}
- repaint();
+ tqrepaint();
}
}
@@ -1378,7 +1378,7 @@
}
item = item->nextSibling();
}
- // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
+ // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
setStoredState( internalState() , key );
}
@@ -1388,7 +1388,7 @@
int h = height();
KviTalListView *lv = listView();
if ( lv )
- h = TQMAX( lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv),
+ h = TQMAX( lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv),
h );
h = TQMAX( h, TQApplication::globalStrut().height() );
setHeight( h );
@@ -1402,7 +1402,7 @@
if ( myType == RadioButtonController && pixmap( 0 ) ) {
// r += 0;
} else {
- r += lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+ r += lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
}
}
return TQMAX( r, TQApplication::globalStrut().width() );
@@ -1420,7 +1420,7 @@
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
- if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
+ if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -1437,7 +1437,7 @@
parentControl = TRUE;
TQFontMetrics fm( lv->fontMetrics() );
- int boxsize = lv->tqstyle().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
+ int boxsize = lv->tqstyle().tqpixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@@ -1519,7 +1519,7 @@
(lv->rootIsDecorated() || myType == RadioButton ||
(myType == CheckBox && parentControl) ) ) {
TQRect rect;
- int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( lv->columnAlignment(0) == AlignCenter ) {
TQFontMetrics fm( lv->font() );
int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize;
diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
index 47d23fb5..cf72e9ff 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
@@ -143,7 +143,7 @@ public:
KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
~KviTalCheckListItem();
- void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int alignment );
+ void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
virtual void paintFocus( TQPainter *, const TQColorGroup & cg,
const TQRect & r );
int width( const TQFontMetrics&, const KviTalListView*, int column) const;
diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
index 15acac62..83e46869 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
@@ -152,7 +152,7 @@ public:
~KviTalCheckListItem();
void paintCell(TQPainter *, const TQColorGroup & cg,
- int column, int width, int alignment);
+ int column, int width, int tqalignment);
virtual void paintFocus(TQPainter *, const TQColorGroup &cg,
const TQRect & r);
int width(const TQFontMetrics&, const KviTalListView*, int column) const;
diff --git a/src/kvilib/tal/kvi_tal_textedit_qt3.h b/src/kvilib/tal/kvi_tal_textedit_qt3.h
index 1c703e77..68e86ce7 100644
--- a/src/kvilib/tal/kvi_tal_textedit_qt3.h
+++ b/src/kvilib/tal/kvi_tal_textedit_qt3.h
@@ -25,7 +25,7 @@
//
//=============================================================================
-#include <textedit.h>
+#include <tqtextedit.h>
class KVILIB_API KviTalTextEdit : public TQTextEdit
{
diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
index 85e24f3e..80ac44aa 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.cpp
+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
@@ -49,7 +49,7 @@
{
//setFrameStyle(TQFrame::NoFrame);
setObjectName(nam);
- if(!layout())
+ if(!tqlayout())
this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight));
w->addToolBar(dock,this);
}
@@ -58,14 +58,14 @@
{
//setFrameStyle(TQFrame::NoFrame);
setObjectName(name);
- if(!layout())
+ if(!tqlayout())
this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight));
w->addToolBar(this);
}
TQBoxLayout * KviTalToolBar::boxLayout()
{
- return (TQBoxLayout*)this->layout();
+ return (TQBoxLayout*)this->tqlayout();
}
void KviTalToolBar::setBoxLayout(TQBoxLayout * l)
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index 35a81e5a..53b7c03f 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -39,11 +39,11 @@
#else
#include <tqlabel.h>
#include <tqpushbutton.h>
- #include <layout.h>
+ #include <tqlayout.h>
#include <tqevent.h>
#include <tqframe.h>
#include <tqwidgetstack.h>
- #include <palette.h>
+ #include <tqpalette.h>
#endif
@@ -184,7 +184,7 @@ KviTalWizard::KviTalWizard(TQWidget * pParent)
#endif
m_p->pStepsLabel = new TQLabel(this);
m_p->pStepsLabel->setMinimumWidth(80);
- m_p->pStepsLabel->setAlignment(TQt::AlignRight);
+ m_p->pStepsLabel->tqsetAlignment(TQt::AlignRight);
#ifdef COMPILE_USE_QT4
m_p->pLayout->addWidget(m_p->pStepsLabel,0,4,1,3);
#else
@@ -413,7 +413,7 @@ void KviTalWizard::setCurrentPage(KviTalWizardPageData * pData)
szSteps = "<nobr><font color=\"";
szSteps += clrMid.name();
szSteps += "\"><b>[";
- szSteps += TQString("Step %1 of %2").arg(pData->iVisibleIndex).arg(m_p->iEnabledPageCount);
+ szSteps += TQString("Step %1 of %2").tqarg(pData->iVisibleIndex).tqarg(m_p->iEnabledPageCount);
szSteps += "]</b></font></nobr>";
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 23:30:41 +0000