summaryrefslogtreecommitdiffstats
path: root/kalzium/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:18:52 +0000
commit648ba4a456d3aad2825193ff8f3bd52a875783b5 (patch)
tree0b50d2253a0c85238cc4dcba5c4f949de3f0eb15 /kalzium/src
parent98a12d05a48814bec3870b9a6d5865475cfa1c95 (diff)
downloadtdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.tar.gz
tdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalzium/src')
-rw-r--r--kalzium/src/detailinfodlg.cpp6
-rw-r--r--kalzium/src/element.cpp4
-rw-r--r--kalzium/src/elementdataviewer.cpp12
-rw-r--r--kalzium/src/elementdataviewer.h4
-rw-r--r--kalzium/src/eqchemview.cpp8
-rw-r--r--kalzium/src/eqchemview.h2
-rw-r--r--kalzium/src/eqresult.cpp4
-rw-r--r--kalzium/src/kalzium.cpp8
-rw-r--r--kalzium/src/kalzium.h4
-rw-r--r--kalzium/src/kalziumdataobject.cpp12
-rw-r--r--kalzium/src/kalziumdataobject.h2
-rw-r--r--kalzium/src/kalziumtip.cpp50
-rw-r--r--kalzium/src/kalziumtip.h6
-rw-r--r--kalzium/src/kalziumutils.cpp4
-rw-r--r--kalzium/src/molcalcwidgetbase.ui8
-rw-r--r--kalzium/src/orbitswidget.cpp4
-rw-r--r--kalzium/src/periodictableview.cpp10
-rw-r--r--kalzium/src/plotsetupwidget.ui12
-rw-r--r--kalzium/src/settings_colors.ui70
-rw-r--r--kalzium/src/settings_misc.ui6
-rw-r--r--kalzium/src/settings_units.ui4
-rw-r--r--kalzium/src/somwidget.ui16
-rw-r--r--kalzium/src/somwidget_impl.cpp2
-rw-r--r--kalzium/src/spectrum.cpp2
-rw-r--r--kalzium/src/spectrumview.ui12
-rw-r--r--kalzium/src/spectrumviewimpl.cpp2
-rw-r--r--kalzium/src/spectrumwidget.cpp4
-rw-r--r--kalzium/src/timewidget.ui16
-rw-r--r--kalzium/src/timewidget_impl.cpp2
29 files changed, 148 insertions, 148 deletions
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 927de2dc..c4fc8899 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -94,10 +94,10 @@ void DetailedInfoDlg::setElement(Element *element)
KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname )
{
TQFrame *frame = addPage(title, icontext, BarIcon(iconname));
- TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
- tqlayout->setMargin( 0 );
+ TQVBoxLayout *layout = new TQVBoxLayout( frame );
+ layout->setMargin( 0 );
KHTMLPart *w = new KHTMLPart( frame, "html-part", frame );
- tqlayout->addWidget( w->view() );
+ layout->addWidget( w->view() );
return w;
}
diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index 2596e2f7..3fc7e493 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -68,8 +68,8 @@ TQString Element::parsedOrbits( bool canBeEmpty )
TQString orbits = m_orbits;
TQRegExp rxs("([a-z])([0-9]+)");
TQRegExp rxb("([a-z]{2}) ",false);
- orbits.tqreplace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number
- orbits.tqreplace(rxb,"<b>\\1</b> "); //bold around element symbols
+ orbits.replace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number
+ orbits.replace(rxb,"<b>\\1</b> "); //bold around element symbols
return orbits;
}
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index b31f51ce..108889cc 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -41,7 +41,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
yData = new AxisData();
- TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
+ TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
m_pPlotSetupWidget = new PlotSetupWidget( plainPage(), "plotsetup" );
m_pPlotSetupWidget->from->setMaxValue( d->numberOfElements() - 1 );
@@ -51,10 +51,10 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
m_pPlotWidget->setMinimumWidth( 200 );
m_pPlotWidget->resize( 400, m_pPlotWidget->height() );
- tqlayout->addWidget( m_pPlotSetupWidget );
- tqlayout->addWidget( m_pPlotWidget );
- tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 );
- tqlayout->setStretchFactor( m_pPlotWidget, 1 );
+ layout->addWidget( m_pPlotSetupWidget );
+ layout->addWidget( m_pPlotWidget );
+ layout->setStretchFactor( m_pPlotSetupWidget, 0 );
+ layout->setStretchFactor( m_pPlotWidget, 1 );
// setup the list of names
EList::iterator it = d->ElementList.begin();
@@ -294,7 +294,7 @@ void ElementDataViewer::drawPlot()
/*
* reserve the memory for the KPlotObjects
*/
- //TODO QT4 tqreplace TQMemArray with QVector
+ //TODO QT4 replace TQMemArray with QVector
TQMemArray<KPlotObject*> dataPoint(num);
TQMemArray<KPlotObject*> dataPointLabel(num);
diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h
index 476ddaa1..76fea4b1 100644
--- a/kalzium/src/elementdataviewer.h
+++ b/kalzium/src/elementdataviewer.h
@@ -79,9 +79,9 @@ class AxisData
private:
/**
- * the dataList tqcontains the values off all elements
+ * the dataList contains the values off all elements
* but only of the currently selected data type. This
- * means that it eg tqcontains all boiling points
+ * means that it eg contains all boiling points
*/
DoubleList dataList;
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index aa73c40b..fee6e9c7 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -50,7 +50,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent)
{
settingsChanged();
- TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout");
+ TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout");
m_eqResult = new EqResult(this);
m_eqedit = new KLineEdit(this);
@@ -74,7 +74,7 @@ eqchemView::~eqchemView()
void eqchemView::settingsChanged()
{
// i18n : internationalization
- emit signalChangetqStatusbar( i18n("Settings changed") );
+ emit signalChangeStatusbar( i18n("Settings changed") );
}
@@ -89,8 +89,8 @@ void eqchemView::clear()
void eqchemView::compute()
{
TQString equation( m_eqedit->text() );
- equation.tqreplace("+", "+");
- equation.tqreplace("->", " -> ");
+ equation.replace("+", "+");
+ equation.replace("->", " -> ");
equation.append(" ");
equation.prepend(" ");
diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h
index 6dbf5e8c..0e1ad686 100644
--- a/kalzium/src/eqchemview.h
+++ b/kalzium/src/eqchemview.h
@@ -58,7 +58,7 @@ signals:
/**
* Use this signal to change the content of the statusbar
*/
- void signalChangetqStatusbar(const TQString& text);
+ void signalChangeStatusbar(const TQString& text);
/**
* Use this signal to change the content of the caption
diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp
index 2e0d9398..c128c93e 100644
--- a/kalzium/src/eqresult.cpp
+++ b/kalzium/src/eqresult.cpp
@@ -61,7 +61,7 @@ void AnswerItem::paint( TQPainter* painter )
TQRect r ( 0, 0, listBox()->contentsWidth(), height( listBox() ) );
painter->fillRect( r, m_bgcolor );
- TQColorGroup cg = listBox()->tqcolorGroup();
+ TQColorGroup cg = listBox()->colorGroup();
cg.setColor( TQColorGroup::Background, m_bgcolor );
m_richtext->draw(painter, 0, 0, r, cg );
@@ -101,7 +101,7 @@ EqResult::~EqResult()
void EqResult::add(const TQString & question, const TQString & answer)
{
- TQColor bgcolor = tqcolorGroup().base();
+ TQColor bgcolor = colorGroup().base();
if ( m_alternate_color )
bgcolor = bgcolor.dark( 120 );
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 3ec34a52..84c2c984 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -75,9 +75,9 @@ Kalzium::Kalzium()
m_toolboxCurrent = 0;
connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), this, TQT_SLOT( openInformationDialog( int ) ));
- connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotqStatusbar( int ) ));
+ connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotStatusbar( int ) ));
- // tqlayouting
+ // layouting
setCentralWidget( centralWidget );
centralWidget->show();
@@ -212,7 +212,7 @@ void Kalzium::setupSidebars()
TQVBoxLayout *lay = new TQVBoxLayout( fake, 5 );
lay->activate();
m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" );
- m_detailWidget->setMinimumSize( 200, m_detailWidget->tqminimumSize().height() );
+ m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() );
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotSelectedNumber( int ) ));
lay->addWidget( m_detailWidget );
lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) );
@@ -419,7 +419,7 @@ void Kalzium::setupStatusBar()
statusBar()->show();
}
-void Kalzium::slotqStatusbar( int num )
+void Kalzium::slotStatusbar( int num )
{
Element *e = KalziumDataObject::instance()->element( num );
statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO );
diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h
index 755af39d..1a726fed 100644
--- a/kalzium/src/kalzium.h
+++ b/kalzium/src/kalzium.h
@@ -105,7 +105,7 @@ class Kalzium : public KMainWindow
KToggleAction *m_actionCrystal;
/**
- * the tqlayout of the central Widget ( CentralWidget )
+ * the layout of the central Widget ( CentralWidget )
*/
TQVBoxLayout *m_pCentralLayout;
@@ -129,7 +129,7 @@ class Kalzium : public KMainWindow
*/
void openInformationDialog( int number );
- void slotqStatusbar( int num );
+ void slotStatusbar( int num );
void setupStatusBar();
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index f25cbfc4..a759fee2 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject()
KURL url;
url.setPath( locate("data", "kalzium/data/"));
url.setFileName( "data.xml" );
- TQFile tqlayoutFile( url.path() );
+ TQFile layoutFile( url.path() );
- if (!tqlayoutFile.exists())
+ if (!layoutFile.exists())
{
kdDebug() << "data.xml not found, exiting" << endl;
kapp->exit(0);
return;
}
- if (!tqlayoutFile.open(IO_ReadOnly))
+ if (!layoutFile.open(IO_ReadOnly))
{
kdDebug() << "data.xml IO-error" << endl;
return;
}
// Check if the document is well-formed
- if (!doc.setContent(&tqlayoutFile))
+ if (!doc.setContent(&layoutFile))
{
kdDebug() << "wrong xml" << endl;
- tqlayoutFile.close();
+ layoutFile.close();
return;
}
- tqlayoutFile.close();
+ layoutFile.close();
ElementList = readData( doc );
m_numOfElements = ElementList.count();
diff --git a/kalzium/src/kalziumdataobject.h b/kalzium/src/kalziumdataobject.h
index f6365ef8..e8508276 100644
--- a/kalzium/src/kalziumdataobject.h
+++ b/kalzium/src/kalziumdataobject.h
@@ -23,7 +23,7 @@
#include "element.h"
/**
- * @short This class tqcontains all Element objects
+ * @short This class contains all Element objects
*
* This singleton class collects all the information about the elements of the
* Periodic Table as list of Element (TQValueList<Element*>).
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index c1b6299e..ba2a8252 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -82,8 +82,8 @@ void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int
if( element == m_tippedElement )
{
// Avoid moving out of the current screen
- if (m_mousePointer.x()+width() > tqApp->desktop()->width())
- m_mousePointer.setX(tqApp->desktop()->width() - width());
+ if (m_mousePointer.x()+width() > qApp->desktop()->width())
+ m_mousePointer.setX(qApp->desktop()->width() - width());
move(m_mousePointer); //do not paint again if already painted
}
@@ -139,7 +139,7 @@ void KalziumTip::display()
m_richText->setWidth(400);
- m_tqmaskEffect = isVisible() ? Plain : Dissolve;
+ m_maskEffect = isVisible() ? Plain : Dissolve;
m_dissolveSize = 24;
m_dissolveDelta = -1;
@@ -172,13 +172,13 @@ void KalziumTip::displayInternal()
int width = textX + textRect.width() + margin;
int textY = (height - textRect.height()) / 2;
- //resize pixmap, tqmask and widget
- m_tqmask.resize(width, height);
+ //resize pixmap, mask and widget
+ m_mask.resize(width, height);
m_pixmap.resize(width, height);
resize(width, height);
- // create and set transparency tqmask
- switch(m_tqmaskEffect)
+ // create and set transparency mask
+ switch(m_maskEffect)
{
case Plain:
plainMask();
@@ -206,32 +206,32 @@ void KalziumTip::displayInternal()
}
// draw text shadow
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text
- cg = tqcolorGroup();
+ cg = colorGroup();
m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
}
void KalziumTip::dissolveMask()
{
- TQPainter tqmaskPainter(&m_tqmask);
+ TQPainter maskPainter(&m_mask);
- m_tqmask.fill(Qt::black);
+ m_mask.fill(Qt::black);
- tqmaskPainter.setBrush(Qt::white);
- tqmaskPainter.setPen(Qt::white);
- tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
- 1600 / m_tqmask.rect().height());
+ maskPainter.setBrush(Qt::white);
+ maskPainter.setPen(Qt::white);
+ maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
+ 1600 / m_mask.rect().height());
m_dissolveSize += m_dissolveDelta;
if (m_dissolveSize > 0)
{
- tqmaskPainter.setRasterOp(Qt::EraseROP);
+ maskPainter.setRasterOp(Qt::EraseROP);
int x, y, s;
const int size = 16;
@@ -247,7 +247,7 @@ void KalziumTip::dissolveMask()
{
s = 0;
}
- tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
+ maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
}
}
}
@@ -257,7 +257,7 @@ void KalziumTip::dissolveMask()
m_dissolveDelta = 1;
}
- setMask(m_tqmask);
+ setMask(m_mask);
}
void KalziumTip::hide()
@@ -269,15 +269,15 @@ void KalziumTip::hide()
void KalziumTip::plainMask()
{
- TQPainter tqmaskPainter(&m_tqmask);
+ TQPainter maskPainter(&m_mask);
- m_tqmask.fill(Qt::black);
+ m_mask.fill(Qt::black);
- tqmaskPainter.setBrush(Qt::white);
- tqmaskPainter.setPen(Qt::white);
- tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
- 1600 / m_tqmask.rect().height());
- setMask(m_tqmask);
+ maskPainter.setBrush(Qt::white);
+ maskPainter.setPen(Qt::white);
+ maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
+ 1600 / m_mask.rect().height());
+ setMask(m_mask);
m_frameTimer.stop();
}
diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h
index 5ef58a20..0186529f 100644
--- a/kalzium/src/kalziumtip.h
+++ b/kalzium/src/kalziumtip.h
@@ -66,20 +66,20 @@ class KalziumTip : public QWidget
void internalUpdate();
private:
- TQBitmap m_tqmask;
+ TQBitmap m_mask;
TQPoint m_mousePointer;
TQPixmap m_pixmap;
TQPixmap m_icon; //icon shown on the tip
TQPixmap m_noElemIcon; //icon for element wich have no image
- MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain
+ MaskEffect m_maskEffect; //inidicates to show mask effect or plain
TQSimpleRichText* m_richText;
int m_dissolveSize;
int m_dissolveDelta;
TQTimer m_frameTimer; //timer for the dissolve effect
- bool m_dirty; //indicates tqrepainting the tooltip internal
+ bool m_dirty; //indicates repainting the tooltip internal
const Element* m_tippedElement; //the element the tip is about
};
diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp
index d2b2baa8..1522e495 100644
--- a/kalzium/src/kalziumutils.cpp
+++ b/kalzium/src/kalziumutils.cpp
@@ -38,7 +38,7 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo
r = p->boundingRect( TQRect(), Qt::AlignAuto, string );
r.moveBy( rect.left(), rect.top() );
- if ( rect.tqcontains( r ) )
+ if ( rect.contains( r ) )
goodSizeFound = true;
else
size--;
@@ -69,7 +69,7 @@ double KalziumUtils::strippedValue( double num )
power *= 10;
num = num / power * 10000;
- num = tqRound( num );
+ num = qRound( num );
return num * power / 10000;
}
diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui
index 2ab8c5f8..a330b773 100644
--- a/kalzium/src/molcalcwidgetbase.ui
+++ b/kalzium/src/molcalcwidgetbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>MolcalcWidgetBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -69,7 +69,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -127,7 +127,7 @@
<slots>
<slot access="protected">slotCalcButtonClicked()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kalzium/src/orbitswidget.cpp b/kalzium/src/orbitswidget.cpp
index 2ab82731..06824c0f 100644
--- a/kalzium/src/orbitswidget.cpp
+++ b/kalzium/src/orbitswidget.cpp
@@ -162,7 +162,7 @@ void OrbitsWidget::getNumberOfOrbits()
int cut = 0;
bool cont = true;
- if ( !o.tqcontains( rxb ) ) //only true for H and He
+ if ( !o.contains( rxb ) ) //only true for H and He
numOfElectrons.append( o.toInt() );
else //every other element
{
@@ -175,7 +175,7 @@ void OrbitsWidget::getNumberOfOrbits()
o = o.right( cut );
num++;
- if ( !o.tqcontains( rxb ) )
+ if ( !o.contains( rxb ) )
{
numOfElectrons.append( o.toInt() );
cont = false;
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index d58f03ab..a09dcf34 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -328,7 +328,7 @@ void PerodicTableView::resizeEvent( TQResizeEvent * /*e*/ )
table->resize( width(), height() );
table2->resize( width(), height() );
// XXX: I know it isn't the best way, but otherwise the table won't be redrawn
- // on tqrepaint... Feel *free* to remove these two lines if you foind a better
+ // on repaint... Feel *free* to remove these two lines if you foind a better
// solution...
doFullDraw = true;
update();
@@ -339,8 +339,8 @@ void PerodicTableView::paintEvent( TQPaintEvent * /*e*/ )
TQPainter p;
//JH: I have split the drawing into two pixmaps: table and table2.
- //table tqcontains the "static" PerodicTableView table, and does not change very often.
- //table2 tqcontains the tooltips and any other dynamic overlays.
+ //table contains the "static" PerodicTableView table, and does not change very often.
+ //table2 contains the tooltips and any other dynamic overlays.
//Usually, we can skip the code which renders the table, and just use the
//image stored in table...when doFullDraw==false, the rendering code is skipped.
if ( doFullDraw )
@@ -393,7 +393,7 @@ void PerodicTableView::paintEvent( TQPaintEvent * /*e*/ )
doFullDraw = false;
}
- //JH: Ok, now table tqcontains the static PerodicTableView table, and we may need to draw
+ //JH: Ok, now table contains the static PerodicTableView table, and we may need to draw
//a tooltip on it. However, we don't want to ruin the stored table pixmap,
//so let's copy it to table2 and add the tooltip there.
*table2 = *table;
@@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ )
//JH: only update() if we were showing a tooltip
if ( m_tooltipElementNumber || m_showLegendTooltip )
{
- //this tqinvalidates the number. If the mouse
+ //this invalidates the number. If the mouse
//is moved, the number is invalid.
m_tooltipElementNumber = 0;
m_showLegendTooltip = false;
diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui
index 5fb65406..a395541d 100644
--- a/kalzium/src/plotsetupwidget.ui
+++ b/kalzium/src/plotsetupwidget.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>PlotSetupWidget</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -26,7 +26,7 @@
</widget>
<widget class="QLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -69,7 +69,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -114,7 +114,7 @@
</widget>
<widget class="QLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -248,7 +248,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui
index 1717968a..f32360d0 100644
--- a/kalzium/src/settings_colors.ui
+++ b/kalzium/src/settings_colors.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>setColors</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -36,7 +36,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<vbox>
<property name="name">
@@ -44,7 +44,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout30</cstring>
+ <cstring>layout30</cstring>
</property>
<hbox>
<property name="name">
@@ -122,7 +122,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -163,7 +163,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout26</cstring>
+ <cstring>layout26</cstring>
</property>
<vbox>
<property name="name">
@@ -171,7 +171,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@@ -197,7 +197,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -223,7 +223,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -249,7 +249,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout26</cstring>
+ <cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@@ -290,7 +290,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@@ -298,7 +298,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -324,7 +324,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -350,7 +350,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -376,7 +376,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -402,7 +402,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -428,7 +428,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -454,7 +454,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -480,7 +480,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -521,7 +521,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -529,7 +529,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -558,7 +558,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -584,7 +584,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -625,7 +625,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<vbox>
<property name="name">
@@ -633,7 +633,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout12_2</cstring>
+ <cstring>layout12_2</cstring>
</property>
<hbox>
<property name="name">
@@ -659,7 +659,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout19_2</cstring>
+ <cstring>layout19_2</cstring>
</property>
<hbox>
<property name="name">
@@ -685,7 +685,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout18_2</cstring>
+ <cstring>layout18_2</cstring>
</property>
<hbox>
<property name="name">
@@ -711,7 +711,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout17_2</cstring>
+ <cstring>layout17_2</cstring>
</property>
<hbox>
<property name="name">
@@ -737,7 +737,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout16_2</cstring>
+ <cstring>layout16_2</cstring>
</property>
<hbox>
<property name="name">
@@ -763,7 +763,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout15_2</cstring>
+ <cstring>layout15_2</cstring>
</property>
<hbox>
<property name="name">
@@ -789,7 +789,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout14_2</cstring>
+ <cstring>layout14_2</cstring>
</property>
<hbox>
<property name="name">
@@ -815,7 +815,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout13_2</cstring>
+ <cstring>layout13_2</cstring>
</property>
<hbox>
<property name="name">
@@ -841,7 +841,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -901,7 +901,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui
index e27858dc..a66693dd 100644
--- a/kalzium/src/settings_misc.ui
+++ b/kalzium/src/settings_misc.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>setupMisc</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -67,5 +67,5 @@
</spacer>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kalzium/src/settings_units.ui b/kalzium/src/settings_units.ui
index 4457e59f..e054021a 100644
--- a/kalzium/src/settings_units.ui
+++ b/kalzium/src/settings_units.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>setupUnits</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -163,5 +163,5 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui
index b35bc8b6..83e19209 100644
--- a/kalzium/src/somwidget.ui
+++ b/kalzium/src/somwidget.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SOMWidget</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>10</height>
@@ -58,7 +58,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>10</height>
@@ -67,7 +67,7 @@ the state of matter</string>
</spacer>
<widget class="QLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -91,7 +91,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -102,7 +102,7 @@ the state of matter</string>
</widget>
<widget class="QLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -141,7 +141,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
@@ -178,7 +178,7 @@ the state of matter</string>
</customwidgets>
<connections>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp
index fbb4420a..6e3f4b71 100644
--- a/kalzium/src/somwidget_impl.cpp
+++ b/kalzium/src/somwidget_impl.cpp
@@ -35,7 +35,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name )
{
m_list = KalziumDataObject::instance()->ElementList;
- text->tqsetAlignment( text->tqalignment() | Qt::WordBreak );
+ text->setAlignment( text->alignment() | Qt::WordBreak );
text->setTextFormat( Qt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );
diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 5fea3d8e..dc8abb01 100644
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -97,7 +97,7 @@ void Spectrum::adjustIntensities()
double curInt = ( ( double )( *it ).intensity );
double newInt = max*1000/curInt;
- ( *it ).intensity = tqRound( newInt );
+ ( *it ).intensity = qRound( newInt );
}
}
diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui
index f2460c59..2787ab66 100644
--- a/kalzium/src/spectrumview.ui
+++ b/kalzium/src/spectrumview.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SpectrumView</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -38,7 +38,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -110,7 +110,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -159,7 +159,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>1</height>
@@ -216,7 +216,7 @@
<slots>
<slot access="protected">slotExportAsImage()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>spectrumwidget.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index b78e780e..89bc36ac 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -25,7 +25,7 @@
SpectrumViewImpl::SpectrumViewImpl( TQWidget *parent, const char* name )
: SpectrumView( parent, name )
{
- resize( tqminimumSizeHint() );
+ resize( minimumSizeHint() );
// simulating an update
m_spectrumWidget->setRightBorder( maximumValue->value() );
exportButton->setGuiItem( KGuiItem( i18n( "&Export Spectrum as Image" ), "fileexport" ) );
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index 01b83e72..54f70972 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -57,7 +57,7 @@ SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget(
setType( EmissionSpectrum );
setMinimumSize( 400, 230 );
- tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
setBackgroundMode( NoBackground );
}
@@ -223,7 +223,7 @@ int SpectrumWidget::Adjust( double color, double factor )
if ( color == 0.0 )
return 0;
else
- return tqRound( IntensityMax * pow( color*factor, Gamma ) );
+ return qRound( IntensityMax * pow( color*factor, Gamma ) );
}
void SpectrumWidget::drawTickmarks( TQPainter* p )
diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui
index 55c0ff9f..fcb46391 100644
--- a/kalzium/src/timewidget.ui
+++ b/kalzium/src/timewidget.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>TimeWidget</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -35,7 +35,7 @@
</spacer>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -78,7 +78,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>21</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -194,7 +194,7 @@ of the elements</string>
<slot>setValue(int)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp
index b1e26337..a5f186bc 100644
--- a/kalzium/src/timewidget_impl.cpp
+++ b/kalzium/src/timewidget_impl.cpp
@@ -23,7 +23,7 @@
TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name )
: TimeWidget( parent, name )
{
- text->tqsetAlignment( text->tqalignment() | Qt::WordBreak );
+ text->setAlignment( text->alignment() | Qt::WordBreak );
text->setTextFormat( Qt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );