summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRahul Chowdhury <rahulc93@gmail.com>2015-09-11 22:01:17 (GMT)
committerRahul Chowdhury <rahulc93@gmail.com>2015-09-11 22:09:20 (GMT)
commita2558fac17e48e291aebefa7f483bf0e0b7e1995 (patch)
treecb53a4f2f6353e3666281404fc0366443e2c4a2e
parent19a8d84d382e9ea1cb8e9eb84876994b81f34065 (diff)
Port KDebug -> QDebug
REVIEW: 125180
-rw-r--r--compoundviewer/kalziumglpart.cpp4
-rw-r--r--libscience/chemicaldataobject.cpp2
-rw-r--r--libscience/elementparser.cpp6
-rw-r--r--libscience/isotope.cpp2
-rw-r--r--libscience/moleculeparser.cpp36
-rw-r--r--libscience/parser.cpp6
-rw-r--r--libscience/psetables.cpp2
-rw-r--r--plasmoid/applet/nuclearPlasmoid/kalziumdataobject.cpp2
-rw-r--r--src/calculator/calculator.cpp4
-rw-r--r--src/calculator/concCalculator.cpp3
-rw-r--r--src/calculator/concCalculator.h2
-rw-r--r--src/calculator/gasCalculator.h2
-rw-r--r--src/calculator/nuclearCalculator.h2
-rw-r--r--src/calculator/titrationCalculator.h2
-rw-r--r--src/detailedgraphicaloverview.cpp2
-rw-r--r--src/elementdataviewer.cpp10
-rw-r--r--src/eqchemview.cpp6
-rw-r--r--src/exportdialog.cpp22
-rw-r--r--src/gradientwidget_impl.cpp2
-rw-r--r--src/isotopetable/isotopetabledialog.cpp2
-rw-r--r--src/kalzium.cpp4
-rw-r--r--src/kalziumdataobject.cpp2
-rw-r--r--src/kalziumgradienttype.cpp2
-rw-r--r--src/kalziumschemetype.cpp8
-rw-r--r--src/kalziumutils.cpp2
-rw-r--r--src/kdeeduglossary.cpp6
-rw-r--r--src/legendwidget.cpp4
-rw-r--r--src/molcalcwidget.cpp24
-rw-r--r--src/spectrumviewimpl.cpp2
-rw-r--r--src/spectrumwidget.cpp10
-rw-r--r--src/tableinfowidget.cpp2
-rw-r--r--src/tools/moleculeview.cpp8
-rw-r--r--src/tools/obconverter.cpp2
33 files changed, 97 insertions, 98 deletions
diff --git a/compoundviewer/kalziumglpart.cpp b/compoundviewer/kalziumglpart.cpp
index 001399d..825077d 100644
--- a/compoundviewer/kalziumglpart.cpp
+++ b/compoundviewer/kalziumglpart.cpp
@@ -41,7 +41,7 @@ KalziumGLPart::KalziumGLPart(QWidget* parentWidget, QObject* parent, const QVari
Q_UNUSED(parent);
Q_UNUSED(parentWidget);
Q_UNUSED(args);
- kDebug() << "KalziumGLPart::KalziumGLPart()";
+ qDebug() << "KalziumGLPart::KalziumGLPart()";
m_widget = new KalziumGLWidget();
m_widget->setObjectName("KalziumGLWidget-KPart");
@@ -50,7 +50,7 @@ KalziumGLPart::KalziumGLPart(QWidget* parentWidget, QObject* parent, const QVari
KalziumGLPart::~KalziumGLPart()
{
delete m_widget;
- kDebug() << "KalziumGLPart::~KalziumGLPart()";
+ qDebug() << "KalziumGLPart::~KalziumGLPart()";
}
bool KalziumGLPart::openFile()
diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp
index 687e7f6..1f2c1c8 100644
--- a/libscience/chemicaldataobject.cpp
+++ b/libscience/chemicaldataobject.cpp
@@ -20,9 +20,9 @@
#include "chemicaldataobject.h"
#include <kunitconversion/converter.h>
-#include <kdebug.h>
#include <QLatin1String>
+#include <QDebug>
class ChemicalDataObjectPrivate : public QSharedData
{
diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index 7c5ecaf..4125778 100644
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -17,7 +17,7 @@ email : cniehaus@kde.org
#include <kunitconversion/converter.h>
#include "element.h"
-#include <kdebug.h>
+#include <QDebug>
#include <klocale.h>
class ElementSaxParser::Private
@@ -116,9 +116,9 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co
} else if ((d->inElement && localName == "scalar") || localName == "array") {
for (int i = 0; i < attrs.length(); ++i) {
if (attrs.localName(i) == "units") {
-// kDebug() << "value of the unit: " << attrs.value(i);
+// qDebug() << "value of the unit: " << attrs.value(i);
d->currentUnit = unit(attrs.value(i));
-// kDebug() << "Took " << d->currentUnit;
+// qDebug() << "Took " << d->currentUnit;
continue;
}
diff --git a/libscience/isotope.cpp b/libscience/isotope.cpp
index 91db538..68c79a6 100644
--- a/libscience/isotope.cpp
+++ b/libscience/isotope.cpp
@@ -21,7 +21,7 @@
#include "chemicaldataobject.h"
-#include <kdebug.h>
+#include <QDebug>
Isotope::Isotope()
{
diff --git a/libscience/moleculeparser.cpp b/libscience/moleculeparser.cpp
index 061cd38..76ca6c5 100644
--- a/libscience/moleculeparser.cpp
+++ b/libscience/moleculeparser.cpp
@@ -16,7 +16,7 @@
#include <ctype.h>
-#include <kdebug.h>
+#include <QDebug>
#include <QFile>
#include <QStandardPaths>
@@ -127,9 +127,9 @@ bool MoleculeParser::weight(const QString &_shortMoleculeString,
// Expand the molecule string
// Example : MeOH -> (CH3)OH
- kDebug() << _shortMoleculeString << "is going to be expanded";
+ qDebug() << _shortMoleculeString << "is going to be expanded";
_moleculeString = expandFormula(_shortMoleculeString);
- kDebug() << _moleculeString << "is the expanded string";
+ qDebug() << _moleculeString << "is the expanded string";
// Now set the expanded string
// Initialize the parsing process, and parse te molecule.
@@ -167,7 +167,7 @@ bool MoleculeParser::parseSubmolecule(double *_resultMass,
*_resultMass = 0.0;
_resultMap->clear();
while (parseTerm(&subMass, &subMap)) {
- //kDebug() << "Parsed a term, weight = " << subresult;
+ //qDebug() << "Parsed a term, weight = " << subresult;
// Add the mass and composition of the submolecule to the total.
*_resultMass += subMass;
@@ -195,7 +195,7 @@ bool MoleculeParser::parseTerm(double *_resultMass,
_resultMap->clear();
if (nextToken() == ELEMENT_TOKEN) {
- //kDebug() << "Parsed an element: " << m_elementVal->symbol();
+ //qDebug() << "Parsed an element: " << m_elementVal->symbol();
*_resultMass = m_elementVal->dataAsVariant( ChemicalDataObject::mass ).toDouble();
_resultMap->add(m_elementVal, 1);
@@ -208,7 +208,7 @@ bool MoleculeParser::parseTerm(double *_resultMass,
// Must end in a ")".
if (nextToken() == ')') {
- //kDebug() << "Parsed a submolecule. weight = " << *_result;
+ //qDebug() << "Parsed a submolecule. weight = " << *_result;
getNextToken();
} else {
return false;
@@ -220,7 +220,7 @@ bool MoleculeParser::parseTerm(double *_resultMass,
// Optional number.
if (nextToken() == INT_TOKEN) {
- //kDebug() << "Parsed a number: " << intVal();
+ //qDebug() << "Parsed a number: " << intVal();
*_resultMass *= intVal();
_resultMap->multiply(intVal());
@@ -228,7 +228,7 @@ bool MoleculeParser::parseTerm(double *_resultMass,
getNextToken();
}
- kDebug() << "Weight of term = " << *_resultMass;
+ qDebug() << "Weight of term = " << *_resultMass;
return true;
}
@@ -242,7 +242,7 @@ int MoleculeParser::getNextToken()
QString name;
#if 0
- kDebug() << "getNextToken(): Next character = "
+ qDebug() << "getNextToken(): Next character = "
<< nextChar() << endl;
#endif
@@ -275,11 +275,11 @@ int MoleculeParser::getNextToken()
Element *MoleculeParser::lookupElement(const QString& _name)
{
- kDebug() << "looking up " << _name;
+ qDebug() << "looking up " << _name;
foreach (Element* e, m_elementList) {
if (e->dataAsVariant(ChemicalDataObject::symbol) == _name) {
- kDebug() << "Found element " << _name;
+ qDebug() << "Found element " << _name;
return e;
}
}
@@ -287,7 +287,7 @@ Element *MoleculeParser::lookupElement(const QString& _name)
//if there is an error make m_error true.
m_error = true;
- kDebug() << "no such element!: " << _name;
+ qDebug() << "no such element!: " << _name;
return NULL;
}
@@ -319,7 +319,7 @@ QString MoleculeParser::expandFormula( const QString& _shortString)
_fullString += temp;
} else if (!((expandedTerm = expandTerm(temp)).isEmpty())) {
// If an expansion was made, return the expansion
- kDebug() << "expanded" << temp << "to" << expandedTerm;
+ qDebug() << "expanded" << temp << "to" << expandedTerm;
_fullString += '('+expandedTerm+')';
} else { // invalid term, append it. (Validation is done later anyway.)
_fullString += temp;
@@ -356,7 +356,7 @@ QString MoleculeParser::expandFormula( const QString& _shortString)
} else { // invalid character, return it, validation is done again later
_fullString += *i;
++i;
- kDebug() << *i << "invalid character!";
+ qDebug() << *i << "invalid character!";
}
}
@@ -377,7 +377,7 @@ QString MoleculeParser::expandTerm (const QString& _group)
// Check file validity
if (!(!file.open(QIODevice::ReadOnly | QIODevice::Text))) {
- kDebug() << fileName << " opened";
+ qDebug() << fileName << " opened";
QTextStream in(&file);
// Get all shortForms and fullForms in the file.
@@ -395,7 +395,7 @@ QString MoleculeParser::expandTerm (const QString& _group)
}
}
} else {
- kDebug() << fileName << " could not be opened!";
+ qDebug() << fileName << " could not be opened!";
}
// Find the system defined aliases
@@ -405,7 +405,7 @@ QString MoleculeParser::expandTerm (const QString& _group)
// Check file validity
if (!(!file2.open(QIODevice::ReadOnly | QIODevice::Text))) {
- kDebug() << fileName << " opened";
+ qDebug() << fileName << " opened";
QTextStream in(&file2);
// Get all shortForms and fullForms in the file.
@@ -422,7 +422,7 @@ QString MoleculeParser::expandTerm (const QString& _group)
}
}
} else {
- kDebug() << fileName << " could not be opened!";
+ qDebug() << fileName << " could not be opened!";
}
// Sample expansions, work even when file is not found, testing purposes
diff --git a/libscience/parser.cpp b/libscience/parser.cpp
index e34f189..5c4e7aa 100644
--- a/libscience/parser.cpp
+++ b/libscience/parser.cpp
@@ -15,7 +15,7 @@
#include <ctype.h>
-#include <kdebug.h>
+#include <QDebug>
Parser::Parser()
@@ -133,8 +133,8 @@ bool Parser::parseSimpleFloat(double *_result)
int Parser::getNextChar()
{
-// kDebug() << "Parser::getNextChar(): char = " << m_nextChar;
-// kDebug() << "m_str.size() " << m_str.size() << " with m_str: " << m_str << " and m_index: " << m_index;
+// qDebug() << "Parser::getNextChar(): char = " << m_nextChar;
+// qDebug() << "m_str.size() " << m_str.size() << " with m_str: " << m_str << " and m_index: " << m_index;
++m_index;
diff --git a/libscience/psetables.cpp b/libscience/psetables.cpp
index d7e12a0..95942d3 100644
--- a/libscience/psetables.cpp
+++ b/libscience/psetables.cpp
@@ -22,7 +22,7 @@
#include "psetables.h"
#include <klocale.h>
-#include <kdebug.h>
+#include <QDebug>
pseTables::pseTables()
diff --git a/plasmoid/applet/nuclearPlasmoid/kalziumdataobject.cpp b/plasmoid/applet/nuclearPlasmoid/kalziumdataobject.cpp
index dff6b46..673dccb 100644
--- a/plasmoid/applet/nuclearPlasmoid/kalziumdataobject.cpp
+++ b/plasmoid/applet/nuclearPlasmoid/kalziumdataobject.cpp
@@ -30,7 +30,7 @@
#include <QPainter>
#include <klocale.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kpixmapcache.h>
#include <QXmlReader>
diff --git a/src/calculator/calculator.cpp b/src/calculator/calculator.cpp
index d103449..0ed065c 100644
--- a/src/calculator/calculator.cpp
+++ b/src/calculator/calculator.cpp
@@ -19,7 +19,7 @@
#include "calculator.h"
-#include <kdebug.h>
+#include <QDebug>
#include <kactioncollection.h>
#include <kstandardaction.h>
#include <ktoolinvocation.h>
@@ -91,7 +91,7 @@ void calculator::slotItemSelection(QTreeWidgetItem *item)
}
//DEBUG
- kDebug() << "Item clicked: " << item->text(0);
+ qDebug() << "Item clicked: " << item->text(0);
QString s = item->text(0);
diff --git a/src/calculator/concCalculator.cpp b/src/calculator/concCalculator.cpp
index 23896f4..6a0ad41 100644
--- a/src/calculator/concCalculator.cpp
+++ b/src/calculator/concCalculator.cpp
@@ -19,13 +19,12 @@
#include "concCalculator.h"
-#include <kdebug.h>
#include <ktoolinvocation.h>
#include "kalziumutils.h"
#include <kunitconversion/converter.h>
#include "prefs.h"
#include <klocalizedstring.h>
-
+#include <QDebug>
using namespace KUnitConversion;
concCalculator::concCalculator(QWidget * parent) : QFrame(parent)
diff --git a/src/calculator/concCalculator.h b/src/calculator/concCalculator.h
index 54c1fa1..ffee63b 100644
--- a/src/calculator/concCalculator.h
+++ b/src/calculator/concCalculator.h
@@ -20,7 +20,7 @@
#ifndef CONCCALCULATOR_H
#define CONCCALCULATOR_H
-#include <kdebug.h>
+#include <QDebug>
#include <prefs.h>
#include <kalziumdataobject.h>
#include <kunitconversion/unitcategory.h>
diff --git a/src/calculator/gasCalculator.h b/src/calculator/gasCalculator.h
index 4cbcecf..edd8bb4 100644
--- a/src/calculator/gasCalculator.h
+++ b/src/calculator/gasCalculator.h
@@ -20,7 +20,7 @@
#ifndef GASCALCULATOR_H
#define GASCALCULATOR_H
-#include <kdebug.h>
+#include <QDebug>
#include <kalziumdataobject.h>
#include <kunitconversion/unitcategory.h>
#include <kunitconversion/converter.h>
diff --git a/src/calculator/nuclearCalculator.h b/src/calculator/nuclearCalculator.h
index c61780a..3c6f895 100644
--- a/src/calculator/nuclearCalculator.h
+++ b/src/calculator/nuclearCalculator.h
@@ -23,7 +23,7 @@
#include <element.h>
#include <isotope.h>
-#include <kdebug.h>
+#include <QDebug>
#include <prefs.h>
#include <kalziumdataobject.h>
#include <kunitconversion/unitcategory.h>
diff --git a/src/calculator/titrationCalculator.h b/src/calculator/titrationCalculator.h
index 18e5b78..36adfe1 100644
--- a/src/calculator/titrationCalculator.h
+++ b/src/calculator/titrationCalculator.h
@@ -23,7 +23,7 @@
#include <element.h>
#include <isotope.h>
-#include <kdebug.h>
+#include <QDebug>
#include <prefs.h>
#include <KPlotWidget>
#include "kplotobject.h"
diff --git a/src/detailedgraphicaloverview.cpp b/src/detailedgraphicaloverview.cpp
index 941cc73..70d671d 100644
--- a/src/detailedgraphicaloverview.cpp
+++ b/src/detailedgraphicaloverview.cpp
@@ -19,7 +19,6 @@ email : cniehaus@kde.org
#include "kalziumutils.h"
//KDE-Includes
-#include <kdebug.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include <kglobal.h>
@@ -31,6 +30,7 @@ email : cniehaus@kde.org
#include <QSvgRenderer>
#include <QRect>
#include <QFileInfo>
+#include <QDebug>
#include <element.h>
#include <QStandardPaths>
diff --git a/src/elementdataviewer.cpp b/src/elementdataviewer.cpp
index 91a5dc4..e5552d9 100644
--- a/src/elementdataviewer.cpp
+++ b/src/elementdataviewer.cpp
@@ -19,7 +19,6 @@
#include <kplotobject.h>
#include <klocale.h>
-#include <kdebug.h>
#include <kactioncollection.h>
#include <kstandardaction.h>
#include <ktoolinvocation.h>
@@ -32,6 +31,7 @@
#include <QKeyEvent>
#include <QPen>
#include <QTimer>
+#include <QDebug>
AxisData::AxisData(AXISTYPE type) : currentDataType(-1)
{
@@ -128,14 +128,14 @@ void ElementDataViewer::fullRange()
void ElementDataViewer::setLimits()
{
- kDebug() << "ElementDataViewer::setLimits()";
+ qDebug() << "ElementDataViewer::setLimits()";
double x1 = 0.0, x2 = 0.0, y1 = 0.0, y2 = 0.0;
getMinMax(x1, x2, m_xData);
getMinMax(y1, y2, m_yData);
- kDebug() << x1 << " :: " << x2 << " ----- " << y1 << " :: " << y2;
+ qDebug() << x1 << " :: " << x2 << " ----- " << y1 << " :: " << y2;
//JH: add some padding to show all points
double dx = 0.05*(x2-x1);
@@ -165,7 +165,7 @@ void ElementDataViewer::getMinMax(double& min, double& max, AxisData * data)
double minValue = data->value(firstElement);
double maxValue = data->value(firstElement);
- kDebug() << "Taking elements from " << firstElement << " to " << lastElement;
+ qDebug() << "Taking elements from " << firstElement << " to " << lastElement;
for (int _currentVal = firstElement; _currentVal <= lastElement; ++_currentVal) { //go over all selected elements
double v = data->value(_currentVal);
@@ -178,7 +178,7 @@ void ElementDataViewer::getMinMax(double& min, double& max, AxisData * data)
}
}
- kDebug() << "The value are ]"<< minValue << " , " << maxValue << "[.";
+ qDebug() << "The value are ]"<< minValue << " , " << maxValue << "[.";
min = minValue;
max = maxValue;
diff --git a/src/eqchemview.cpp b/src/eqchemview.cpp
index ef313f8..065a93f 100644
--- a/src/eqchemview.cpp
+++ b/src/eqchemview.cpp
@@ -21,8 +21,8 @@
#include "eqchemview.h"
#include <QClipboard>
+#include <QDebug>
-#include <kdebug.h>
#include <klocale.h>
#include <LineEditUrlDropEventFilter>
@@ -54,7 +54,7 @@ void EQChemDialog::compute()
QString answer = QString(result);
- kDebug() << "Answer: " << answer;
+ qDebug() << "Answer: " << answer;
ui.answer_label->setText(answer);
@@ -79,7 +79,7 @@ EQChemDialog::EQChemDialog(QWidget *parent) : QWidget(parent)
void EQChemDialog::copyAnswer()
{
- kDebug() << "EQChemDialog::copyAnswer()";
+ qDebug() << "EQChemDialog::copyAnswer()";
QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(ui.answer_label->text(), QClipboard::Clipboard);
}
diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp
index 559861b..06ff386 100644
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@@ -18,7 +18,7 @@
#include <QFont>
#include <KMessageBox>
#include <kdialog.h>
-#include <kdebug.h>
+#include <QDebug>
#include <KLocalizedString>
static const char HTML_HEADER[] =
@@ -76,31 +76,31 @@ PropertyListEntry::~PropertyListEntry()
ExportDialog::ExportDialog(QWidget * parent)
: KDialog(parent),m_outputStream(0)
{
- kDebug() << "ExportDialog::ExportDialog";
+ qDebug() << "ExportDialog::ExportDialog";
setButtons(Help | User1 | Cancel);
- kDebug() << "ExportDialog: setButtons";
+ qDebug() << "ExportDialog: setButtons";
ui.setupUi(mainWidget());
- kDebug() << "ExportDialog: ui.setupUi(mainWidget());";
+ qDebug() << "ExportDialog: ui.setupUi(mainWidget());";
setButtonGuiItem(User1, KGuiItem(i18n("OK")));
- kDebug() << "ExportDialog: setButtonGuiItem(User1, KGuiItem(i18n(\"OK\")));";
+ qDebug() << "ExportDialog: setButtonGuiItem(User1, KGuiItem(i18n(\"OK\")));";
ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);
- kDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
+ qDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
setCaption(i18n("Export Chemical Data"));
- kDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
+ qDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
populateElementList();
- kDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
+ qDebug() << "ui.targetFile->setMode(KFile::File | KFile::Directory | KFile::LocalOnly);";
ui.formatList->addItem(".html (formatted html document)", "html");
ui.formatList->addItem(".xml (raw element data)", "xml");
ui.formatList->addItem(".csv (comma-separated data)", "csv");
- kDebug() << "ui.formatList->addItem(...);";
+ qDebug() << "ui.formatList->addItem(...);";
connect(this, SIGNAL(user1Clicked()), this, SLOT(slotOkClicked()));
- kDebug() << "connect(this, SIGNAL(user1Clicked()), this, SLOT(slotOkClicked()));";
+ qDebug() << "connect(this, SIGNAL(user1Clicked()), this, SLOT(slotOkClicked()));";
setHelp(QString(),"kalzium");
- kDebug() << "setHelp(QString(),\"kalzium\");";
+ qDebug() << "setHelp(QString(),\"kalzium\");";
}
ExportDialog::~ExportDialog()
diff --git a/src/gradientwidget_impl.cpp b/src/gradientwidget_impl.cpp
index 20bb977..6e8561a 100644
--- a/src/gradientwidget_impl.cpp
+++ b/src/gradientwidget_impl.cpp
@@ -15,7 +15,7 @@
#include <QTimer>
-#include <kdebug.h>
+#include <QDebug>
#include <KLocale>
#include <QIcon>
diff --git a/src/isotopetable/isotopetabledialog.cpp b/src/isotopetable/isotopetabledialog.cpp
index b873ae7..4023ba5 100644
--- a/src/isotopetable/isotopetabledialog.cpp
+++ b/src/isotopetable/isotopetabledialog.cpp
@@ -28,7 +28,7 @@
#include <klocale.h>
-#include <kdebug.h>
+#include <QDebug>
#include<prefs.h>
IsotopeTableDialog::IsotopeTableDialog(QWidget* parent) : KDialog(parent)
diff --git a/src/kalzium.cpp b/src/kalzium.cpp
index e70b6cf..9f57c90 100644
--- a/src/kalzium.cpp
+++ b/src/kalzium.cpp
@@ -458,7 +458,7 @@ void Kalzium::slotSwitchtoNumeration(int index)
void Kalzium::slotSwitchtoLookGradient(int which)
{
- kDebug() << "slotSwitchtoLookGradient Kalzium";
+ qDebug() << "slotSwitchtoLookGradient Kalzium";
KalziumElementProperty::instance()->setGradient(which);
@@ -478,7 +478,7 @@ void Kalzium::slotSwitchtoLookGradient(int which)
void Kalzium::slotSwitchtoLookScheme(int which)
{
- kDebug() << "slotSwitchtoLookScheme Kalzium";
+ qDebug() << "slotSwitchtoLookScheme Kalzium";
KalziumElementProperty::instance()->setScheme(which);
diff --git a/src/kalziumdataobject.cpp b/src/kalziumdataobject.cpp
index 8d0f6d1..8f438d7 100644
--- a/src/kalziumdataobject.cpp
+++ b/src/kalziumdataobject.cpp
@@ -30,7 +30,7 @@
#include <QPainter>
#include <QLocale>
-#include <kdebug.h>
+#include <QDebug>
#include <QUrl>
#include <KPixmapCache>
diff --git a/src/kalziumgradienttype.cpp b/src/kalziumgradienttype.cpp
index e9fe0d1..13e4610 100644
--- a/src/kalziumgradienttype.cpp
+++ b/src/kalziumgradienttype.cpp
@@ -25,9 +25,9 @@
#include <kunitconversion/converter.h>
#include <QVariant>
+#include <QDebug>
#include <klocale.h>
-#include <kdebug.h>
#include <math.h>
diff --git a/src/kalziumschemetype.cpp b/src/kalziumschemetype.cpp
index 1a4ce02..79a9c18 100644
--- a/src/kalziumschemetype.cpp
+++ b/src/kalziumschemetype.cpp
@@ -29,7 +29,7 @@
#include <QBrush>
#include <klocale.h>
-#include <kdebug.h>
+#include <QDebug>
#include <QStandardPaths>
@@ -454,7 +454,7 @@ QList<legendPair> KalziumColorSchemeType::legendItems() const
//X {
//X QString crystal = KalziumDataObject::instance()->element(el)->dataAsString(ChemicalDataObject::crystalstructure);
//X
-//X kDebug() << "crystal is " << crystal;
+//X qDebug() << "crystal is " << crystal;
//X
//X static QString resourcepath;
//X if (resourcepath.isEmpty()) {
@@ -487,11 +487,11 @@ QList<legendPair> KalziumColorSchemeType::legendItems() const
//X
//X QBrush ret;
//X if (!filename.isEmpty()) {
-//X kDebug() << el << ": FILENAME is not EMPTY... " << filename;
+//X qDebug() << el << ": FILENAME is not EMPTY... " << filename;
//X QPixmap pixmap(resourcepath + filename);
//X ret = QBrush(pixmap.scaled(elrect.size(), Qt::KeepAspectRatio));
//X } else {
-//X kDebug() << el << ": FILENAME EMPTY... " << filename;
+//X qDebug() << el << ": FILENAME EMPTY... " << filename;
//X ret.setColor(Qt::gray);
//X }
//X
diff --git a/src/kalziumutils.cpp b/src/kalziumutils.cpp
index c7b7e7a..12000c9 100644
--- a/src/kalziumutils.cpp
+++ b/src/kalziumutils.cpp
@@ -18,8 +18,8 @@
#include <QFont>
#include <QRect>
#include <QPainter>
+#include <QDebug>
-#include <kdebug.h>
#include <klocale.h>
#include <element.h>
diff --git a/src/kdeeduglossary.cpp b/src/kdeeduglossary.cpp
index cd73ff9..4cd2168 100644
--- a/src/kdeeduglossary.cpp
+++ b/src/kdeeduglossary.cpp
@@ -20,7 +20,6 @@
#include "kdeeduglossary.h"
-#include <kdebug.h>
#include <klocale.h>
#include <khtml_part.h>
#include <khtmlview.h>
@@ -38,6 +37,7 @@
#include <qstringlist.h>
#include <qtreewidget.h>
#include <QDomDocument>
+#include <QDebug>
static const int FirstLetterRole = 0x00b00a00;
@@ -160,7 +160,7 @@ bool Glossary::loadLayout(QDomDocument &Document, const QUrl &url)
QFile layoutFile(url.path());
if (!layoutFile.exists()) {
- kDebug() << "no such file: " << layoutFile.fileName();
+ qDebug() << "no such file: " << layoutFile.fileName();
return false;
}
@@ -170,7 +170,7 @@ bool Glossary::loadLayout(QDomDocument &Document, const QUrl &url)
// check if document is well-formed
if (!Document.setContent(&layoutFile)) {
- kDebug() << "wrong xml of " << layoutFile.fileName();
+ qDebug() << "wrong xml of " << layoutFile.fileName();
layoutFile.close();
return false;
}
diff --git a/src/legendwidget.cpp b/src/legendwidget.cpp
index 671015a..5df7d4c 100644
--- a/src/legendwidget.cpp
+++ b/src/legendwidget.cpp
@@ -21,11 +21,11 @@
#include "prefs.h"
-#include <kdebug.h>
#include <klocale.h>
#include <QHBoxLayout>
#include <QGridLayout>
+#include <QDebug>
LegendWidget::LegendWidget(QWidget *parent) : QWidget(parent)
{
@@ -40,7 +40,7 @@ LegendWidget::~LegendWidget()
void LegendWidget::setDockArea(Qt::DockWidgetArea newDockArea)
{
- kDebug() << "dock Area changed" << newDockArea;
+ qDebug() << "dock Area changed" << newDockArea;
m_dockArea = newDockArea;
updateContent();
diff --git a/src/molcalcwidget.cpp b/src/molcalcwidget.cpp
index fc79673..d635412 100644
--- a/src/molcalcwidget.cpp
+++ b/src/molcalcwidget.cpp
@@ -30,7 +30,7 @@
#include "search.h"
#include "prefs.h"
-#include <kdebug.h>
+#include <QDebug>
#include <kiconloader.h>
#include <klocale.h>
#include <QPushButton>
@@ -77,7 +77,7 @@ MolcalcWidget::MolcalcWidget(QWidget *parent) : QWidget(parent)
// Check file validity
if (!(!file.open(QIODevice::ReadOnly | QIODevice::Text))) {
- kDebug() << fileName << " opened";
+ qDebug() << fileName << " opened";
QTextStream in(&file);
// Get all shortForms and fullForms in the file.
// eg the short form and full form extracted from ("Me","CH3")
@@ -102,7 +102,7 @@ MolcalcWidget::MolcalcWidget(QWidget *parent) : QWidget(parent)
(i18n("%1",shortForm + " : " + fullForm)));
}
} else {
- kDebug() << fileName << " could not be opened!";
+ qDebug() << fileName << " could not be opened!";
}
// Find the system defined aliases
@@ -114,7 +114,7 @@ MolcalcWidget::MolcalcWidget(QWidget *parent) : QWidget(parent)
// Check file validity
if (!(!file2.open(QIODevice::ReadOnly | QIODevice::Text))) {
- kDebug() << fileName << " opened";
+ qDebug() << fileName << " opened";
QTextStream in(&file2);
// Get all shortForms and fullForms in the file.
@@ -138,7 +138,7 @@ MolcalcWidget::MolcalcWidget(QWidget *parent) : QWidget(parent)
(i18n("%1",shortForm + " : " + fullForm)));
}
} else {
- kDebug() << fileName << " could not be opened!";
+ qDebug() << fileName << " could not be opened!";
}
}
}
@@ -172,10 +172,10 @@ void MolcalcWidget::clear()
void MolcalcWidget::updateUI()
{
- kDebug() << "MolcalcWidget::updateUI()";
+ qDebug() << "MolcalcWidget::updateUI()";
if (m_validInput) {
- kDebug() << "m_validInput == true";
+ qDebug() << "m_validInput == true";
// The complexString stores the whole molecule like this:
// 1 Seaborgium. Cumulative Mass: 263.119 u (39.2564 %)
@@ -231,7 +231,7 @@ void MolcalcWidget::updateUI()
KalziumDataObject::instance()->findElements(list);
#endif
} else { //the input was invalid, so tell this the user
- kDebug() << "m_validInput == false";
+ qDebug() << "m_validInput == false";
ui.resultComposition->setText(i18n("Invalid input"));
ui.resultLabel->setText(QString());
ui.resultMass->setText(QString());
@@ -260,7 +260,7 @@ QString MolcalcWidget::compositionString(ElementCountMap &_map)
void MolcalcWidget::slotCalculate()
{
- kDebug() << "MolcalcWidget::slotCalcButtonClicked()";
+ qDebug() << "MolcalcWidget::slotCalcButtonClicked()";
QString molecule = ui.formulaEdit->text();
// Parse the molecule, and at the same time calculate the total
@@ -269,7 +269,7 @@ void MolcalcWidget::slotCalculate()
m_validInput = m_parser->weight(molecule, &m_mass, &m_elementMap);
m_aliasList = m_parser->aliasList();
}
- kDebug() << "done calculating.";
+ qDebug() << "done calculating.";
updateUI();
}
@@ -314,8 +314,8 @@ void MolcalcWidget::addAlias()
if (!(!file.open(QIODevice::WriteOnly| QIODevice::Append | QIODevice::Text))) {
QTextStream out(&file);
out << "\"" + shortForm + "\",\"" + fullForm + "\"\n";
- kDebug() << fileName << "is the file.";
- kDebug() << "\"" + shortForm + "\",\"" + fullForm + "\"\n";
+ qDebug() << fileName << "is the file.";
+ qDebug() << "\"" + shortForm + "\",\"" + fullForm + "\"\n";
ui.aliasMessage->setText(i18n("done!"));
return;
} else {
diff --git a/src/spectrumviewimpl.cpp b/src/spectrumviewimpl.cpp
index 8c54bb6..f6dd7a3 100644
--- a/src/spectrumviewimpl.cpp
+++ b/src/spectrumviewimpl.cpp
@@ -15,9 +15,9 @@
#include <QTreeWidget>
#include <QTableWidget>
+#include <QDebug>
#include <kunitconversion/converter.h>
-#include <kdebug.h>
#include "kalziumdataobject.h"
#include <klocalizedstring.h>
#include "prefs.h"
diff --git a/src/spectrumwidget.cpp b/src/spectrumwidget.cpp
index c9377ef..c6e86b5 100644
--- a/src/spectrumwidget.cpp
+++ b/src/spectrumwidget.cpp
@@ -27,7 +27,6 @@
#include <element.h>
-#include <kdebug.h>
#include <klocale.h>
#include <kunitconversion/converter.h>
#include <math.h>
@@ -36,6 +35,7 @@
#include <QSizePolicy>
#include <QPainter>
#include <QPixmap>
+#include <QDebug>
#include <qglobal.h>
#if defined(HAVE_IEEEFP_H)
@@ -252,7 +252,7 @@ void SpectrumWidget::keyPressEvent(QKeyEvent *e)
void SpectrumWidget::slotZoomOut()
{
- kDebug() << "SpectrumWidget::slotZoomOut() " << m_startValue << ":: " << m_endValue;
+ qDebug() << "SpectrumWidget::slotZoomOut() " << m_startValue << ":: " << m_endValue;
double diff = m_endValue - m_startValue;
@@ -275,7 +275,7 @@ void SpectrumWidget::slotZoomOut()
void SpectrumWidget::setBorders(double left, double right)
{
- kDebug() << "setBorders " << left << ".." << right;
+ qDebug() << "setBorders " << left << ".." << right;
m_startValue = left;
m_endValue = right;
@@ -288,7 +288,7 @@ void SpectrumWidget::setBorders(double left, double right)
void SpectrumWidget::slotZoomIn()
{
- kDebug() << "SpectrumWidget::slotZoomIn() " << m_startValue << ":: " << m_endValue;
+ qDebug() << "SpectrumWidget::slotZoomIn() " << m_startValue << ":: " << m_endValue;
double diff = m_endValue - m_startValue;
@@ -320,7 +320,7 @@ void SpectrumWidget::mousePressEvent(QMouseEvent *e)
void SpectrumWidget::findPeakFromMouseposition(double wavelength)
{
- kDebug() << "SpectrumWidget::findPeakFromMouseposition()";
+ qDebug() << "SpectrumWidget::findPeakFromMouseposition()";
Spectrum::peak *peak = NULL;
//find the difference in percent (1.0 is 100%, 0.1 is 10%)
diff --git a/src/tableinfowidget.cpp b/src/tableinfowidget.cpp
index dadac48..3fab523 100644
--- a/src/tableinfowidget.cpp
+++ b/src/tableinfowidget.cpp
@@ -20,13 +20,13 @@
#include "prefs.h"
#include "kalziumschemetype.h"
-#include <kdebug.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include "psetables.h"
#include <QHBoxLayout>
+#include <QDebug>
TableInfoWidget::TableInfoWidget(QWidget *parent) : QWidget(parent)
{
diff --git a/src/tools/moleculeview.cpp b/src/tools/moleculeview.cpp
index 031aace..a586b6d 100644
--- a/src/tools/moleculeview.cpp
+++ b/src/tools/moleculeview.cpp
@@ -22,7 +22,7 @@
#include <QGLFormat>
#include <QUndoStack>
#include <QSettings>
-#include <kdebug.h>
+#include <QDebug>
#include <kfiledialog.h>
#include <kjob.h>
#include <kmessagebox.h>
@@ -199,7 +199,7 @@ void MoleculeDialog::loadMolecule(const QString &filename)
return;
}
- kDebug() << "Filename to load: " << filename;
+ qDebug() << "Filename to load: " << filename;
Molecule* molecule = OpenBabel2Wrapper::readMolecule(filename);
@@ -280,7 +280,7 @@ void MoleculeDialog::slotUpdateStatistics()
void MoleculeDialog::slotDownloadNewStuff()
{
- kDebug() << "Kalzium new stuff";
+ qDebug() << "Kalzium new stuff";
KNS3::DownloadDialog dialog(this);
dialog.exec();
@@ -298,7 +298,7 @@ void MoleculeDialog::slotDownloadNewStuff()
foreach (const KNS3::Entry& entry, dialog.changedEntries()) {
// care only about installed ones
if (entry.status() == KNS3::Entry::Installed) {
- kDebug() << "Changed Entry: " << entry.installedFiles();
+ qDebug() << "Changed Entry: " << entry.installedFiles();
foreach (const QString &origFile, entry.installedFiles()) {
const QString destFile = destinationDir + '/' + QFileInfo(origFile).fileName();
KJob *job = KIO::file_move(QUrl::fromLocalFile(origFile), QUrl::fromPath(destFile));
diff --git a/src/tools/obconverter.cpp b/src/tools/obconverter.cpp
index c622eab..c815f55 100644
--- a/src/tools/obconverter.cpp
+++ b/src/tools/obconverter.cpp
@@ -31,7 +31,7 @@
// KDE includes
-#include <KDebug>
+#include <QDebug>
#include <KLocale>
#include <KMessageBox>
#include <KFileDialog>