summaryrefslogtreecommitdiffstats
path: root/kspread/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/plugins')
-rw-r--r--kspread/plugins/calculator/configdlg.cpp8
-rw-r--r--kspread/plugins/calculator/kcalc.cpp48
-rw-r--r--kspread/plugins/calculator/kcalc.h2
-rw-r--r--kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc2
-rw-r--r--kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui2
-rw-r--r--kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc2
-rw-r--r--kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp6
-rw-r--r--kspread/plugins/scripting/scripting.cc4
-rwxr-xr-xkspread/plugins/scripting/scripts/exporthtml/ExportHtml.py4
-rwxr-xr-xkspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py8
10 files changed, 43 insertions, 43 deletions
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index cec64193..e02d914d 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -29,7 +29,7 @@
#include <klocale.h>
#include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
// Undefine HAVE_LONG_DOUBLE for Beta 4 since RedHat 5.0 comes with a borken
// glibc
@@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct)
lay1->setSpacing( KDialog::spacingHint() );
box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box");
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- box->tqlayout()->setMargin(KDialog::marginHint());
+ box->layout()->setSpacing(KDialog::spacingHint());
+ box->layout()->setMargin(KDialog::marginHint());
- TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2);
+ TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2);
label1 = new TQLabel(box);
label1->setText(i18n("Foreground color:"));
grid1->addWidget(label1,0,0);
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 4c80e7b4..b15f844c 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -26,7 +26,7 @@
#include "version.h"
#include <klocale.h>
#include <knotifyclient.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
#include <kapplication.h>
@@ -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
@@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
mainLayout->addLayout(btnLayout);
mainLayout->addLayout(statusLayout);
- // button tqlayout
+ // button layout
btnLayout->addWidget(mSmallPage,0,AlignTop);
btnLayout->addSpacing(mInternalSpacing);
btnLayout->addWidget(mLargePage,0,AlignTop);
- // small button tqlayout
+ // small button layout
smallBtnLayout->addWidget(pbhyp, 0, 0);
smallBtnLayout->addWidget(pbinv, 0, 1);
smallBtnLayout->addWidget(pbA, 0, 2);
@@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
smallBtnLayout->setRowStretch(4, 0);
smallBtnLayout->setRowStretch(5, 0);
- // large button tqlayout
+ // large button layout
largeBtnLayout->addWidget(pbEE, 0, 0);
largeBtnLayout->addWidget(pbMR, 0, 1);
largeBtnLayout->addWidget(pbMplusminus, 0, 2);
@@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
topLayout->addWidget(calc_display, 10);
- // radiobutton tqlayout
+ // radiobutton layout
radioLayout->addWidget(base_group);
radioLayout->addWidget(angle_group);
- // status tqlayout
+ // status layout
statusLayout->addWidget(statusINVLabel);
statusLayout->addWidget(statusHYPLabel);
statusLayout->addWidget(statusERRORLabel, 10);
@@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry()
s.setWidth(mSmallPage->fontMetrics().width("MMM"));
s.setHeight(mSmallPage->fontMetrics().lineSpacing());
- l = (TQObjectList*)mSmallPage->tqchildren(); // silence please
+ l = (TQObjectList*)mSmallPage->children(); // silence please
for(uint i=0; i < l->count(); i++)
{
@@ -586,20 +586,20 @@ 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);
}
}
- l = (TQObjectList*)mLargePage->tqchildren(); // silence please
+ l = (TQObjectList*)mLargePage->children(); // 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()
@@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){
lay1->setSpacing( KDialog::spacingHint() );
TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box");
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- box->tqlayout()->setMargin(KDialog::marginHint());
- TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2);
+ box->layout()->setSpacing(KDialog::spacingHint());
+ box->layout()->setMargin(KDialog::marginHint());
+ TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2);
TQLabel *label = new TQLabel(box,"label");
TQLabel *label2 = new TQLabel(box,"label2");
@@ -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;
}
@@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){
if(calc_display->isLit()){
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText(calc_display->text());
selection_timer->start(100);
@@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){
}
else{
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
CALCAMNT result;
result = (CALCAMNT) cb->text().toDouble();
diff --git a/kspread/plugins/calculator/kcalc.h b/kspread/plugins/calculator/kcalc.h
index dfa67b63..a1205bc2 100644
--- a/kspread/plugins/calculator/kcalc.h
+++ b/kspread/plugins/calculator/kcalc.h
@@ -35,7 +35,7 @@ using std::queue;
#include <ctype.h>
#include <tqlistbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqptrlist.h>
#include <tqaccel.h>
#include <tqtabdialog.h>
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/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index 1bb16a95..c0d5c1ca 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -194,7 +194,7 @@ void PluginInsertCalendar::slotInsertCalendar(const TQDate &start, const TQDate
int row = selection.y();
int col = selection.x();
int colstart = col; //this is where we get back after each week
- sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(end.toString()));
+ sheet->setText(row,colstart,i18n("Calendar from %1 to %2").arg(start.toString()).arg(end.toString()));
TQDate current(start);
// TQDate previous(current);
diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
index 108516dc..9f67dfbb 100644
--- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
+++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp
@@ -45,9 +45,9 @@ using namespace Kross::KSpreadCore;
KSpreadCoreModule::KSpreadCoreModule(Kross::Api::Manager* manager)
: Kross::Api::Module("kspreadcore") , m_manager(manager)
{
- TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
- kdDebug() << " there are " << tqchildren.size() << endl;
- for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++)
+ TQMap<TQString, Object::Ptr> children = manager->getChildren();
+ kdDebug() << " there are " << children.size() << endl;
+ for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
{
kdDebug() << it.key() << " " << it.data() << endl;
}
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") )
diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
index a34a4dd1..529a2d26 100755
--- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
+++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py
@@ -30,11 +30,11 @@ class Dialog(qt.QDialog):
import qt
qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose)
self.setCaption("Export to HTML File")
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setMargin(10)
box.setSpacing(10)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
sheetbox = qt.QHBox(box)
sheetbox.setSpacing(6)
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index e3d6237c..c6da1fe2 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -763,11 +763,11 @@ class SampleDialog(qt.QDialog):
import qt
qt.QDialog.__init__(self, parent, "SampleDialog", 1)
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setMargin(4)
box.setSpacing(10)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
self.scrollview = qt.QScrollView(box)
self.scrollview.setResizePolicy(qt.QScrollView.AutoOne)
@@ -829,11 +829,11 @@ class MainDialog(qt.QDialog):
qt.QDialog.__init__(self, parent, "MainDialog", 1, qt.Qt.WDestructiveClose)
self.setCaption("Script Editor")
- tqlayout = qt.QVBoxLayout(self)
+ layout = qt.QVBoxLayout(self)
box = qt.QVBox(self)
box.setMargin(4)
box.setSpacing(10)
- tqlayout.addWidget(box)
+ layout.addWidget(box)
menu = qt.QMenuBar(box)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 14:32:08 +0000