summaryrefslogtreecommitdiffstats
path: root/kspread/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/plugins')
-rw-r--r--kspread/plugins/calculator/kcalc.cpp22
-rw-r--r--kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc2
-rw-r--r--kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui2
-rw-r--r--kspread/plugins/scripting/scripting.cc4
4 files changed, 15 insertions, 15 deletions
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 4c80e7b4..730cd404 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -80,7 +80,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
// Create the display
calc_display = new DLabel( this, "display" );
calc_display->setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
- calc_display->tqsetAlignment( AlignRight|AlignVCenter );
+ calc_display->setAlignment( AlignRight|AlignVCenter );
calc_display->setFocus();
calc_display->setFocusPolicy( TQ_StrongFocus );
@@ -89,18 +89,18 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
statusINVLabel = new TQLabel( this, "INV" );
Q_CHECK_PTR( statusINVLabel );
statusINVLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- statusINVLabel->tqsetAlignment( AlignCenter );
+ statusINVLabel->setAlignment( AlignCenter );
statusINVLabel->setText("NORM");
statusHYPLabel = new TQLabel( this, "HYP" );
Q_CHECK_PTR( statusHYPLabel );
statusHYPLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- statusHYPLabel->tqsetAlignment( AlignCenter );
+ statusHYPLabel->setAlignment( AlignCenter );
statusERRORLabel = new TQLabel( this, "ERROR" );
Q_CHECK_PTR( statusERRORLabel );
statusERRORLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- statusERRORLabel->tqsetAlignment( AlignLeft|AlignVCenter );
+ statusERRORLabel->setAlignment( AlignLeft|AlignVCenter );
// create angle button group
@@ -586,7 +586,7 @@ void TQtCalculator::updateGeometry()
if( o->isWidgetType() )
{
margin = TQApplication::style().
- tqpixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
+ pixelMetric(TQStyle::PM_ButtonMargin, ((TQWidget *)o))*2;
((TQWidget*)o)->setMinimumSize(s.width()+margin, s.height()+margin);
((TQWidget*)o)->installEventFilter( this );
((TQWidget*)o)->setAcceptDrops(true);
@@ -595,11 +595,11 @@ void TQtCalculator::updateGeometry()
l = (TQObjectList*)mLargePage->tqchildren(); // silence please
- int h1 = pbF->tqminimumSize().height();
+ int h1 = pbF->minimumSize().height();
int h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::style().
- tqpixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, pbF)*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l->count(); i++)
@@ -621,7 +621,7 @@ void TQtCalculator::updateGeometry()
statusINVLabel->setMinimumWidth(s.width());
statusHYPLabel->setMinimumWidth(s.width());
- //setFixedSize(tqminimumSize());
+ //setFixedSize(minimumSize());
}
void TQtCalculator::exit()
@@ -1494,10 +1494,10 @@ void TQtCalculator::configclicked(){
"enabled. See the README for details.");
#endif
- label->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+ label->setAlignment(AlignLeft|WordBreak|ExpandTabs);
label->setText(labelstring);
- label2->tqsetAlignment(AlignLeft|WordBreak|ExpandTabs);
+ label2->setAlignment(AlignLeft|WordBreak|ExpandTabs);
label2->setText(labelstring2);
// HACK
@@ -1540,7 +1540,7 @@ void TQtCalculator::configclicked(){
set_precision();
set_style();
updateGeometry();
- resize(tqminimumSize());
+ resize(minimumSize());
}
delete configdlg;
}
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
index d55c332b..0311c913 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
@@ -40,7 +40,7 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name)
//we start with a default calendar for the current month;
- TQDate first_day_in_month = TQDate::tqcurrentDate();
+ TQDate first_day_in_month = TQDate::currentDate();
first_day_in_month.setYMD(first_day_in_month.year(),first_day_in_month.month(),1);
TQDate last_day_in_month(first_day_in_month.year(),first_day_in_month.month(),first_day_in_month.daysInMonth());
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
index 712b11b4..d2c8fc08 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>19</height>
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cc
index 44f8fa01..a919b31d 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cc
@@ -43,9 +43,9 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
setInstance(KSpreadScriptingFactory::instance());
kdDebug() << "Scripting plugin. Class: "
- << tqmetaObject()->className()
+ << metaObject()->className()
<< ", Parent: "
- << parent->tqmetaObject()->className()
+ << parent->metaObject()->className()
<< "\n";
if ( parent->inherits("KSpread::View") )