1 files changed, 28 insertions, 28 deletions

diff --git a/src/qalculateeditvariabledialog.cpp b/src/qalculateeditvariabledialog.cpp
index 607d908..ed6d208 100644
--- a/src/qalculateeditvariabledialog.cpp
+++ b/src/qalculateeditvariabledialog.cpp
@@ -21,69 +21,69 @@
 #include "qalculate_tde_utils.h"
 #include "qalculateeditnamesdialog.h"
 
-#include <qgrid.h>
+#include <tqgrid.h>
 #include <klineedit.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 #include <kcombobox.h>
-#include <qlabel.h>
+#include <tqlabel.h>
 #include <klocale.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qcheckbox.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqcheckbox.h>
 #include <kmessagebox.h>
-#include <qlayout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 
 extern PrintOptions printops;
 extern EvaluationOptions evalops;
 extern tree_struct variable_cats;
 
-QalculateEditVariableDialog::QalculateEditVariableDialog(QWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Edit Variable"), Ok | Cancel | Help, Ok, true) {
+QalculateEditVariableDialog::QalculateEditVariableDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Edit Variable"), Ok | Cancel | Help, Ok, true) {
 
 	names_edit_dialog = NULL;
 	edited_variable = NULL;
 
-	setMainWidget(new QWidget(this));	
-	QGridLayout *grid = new QGridLayout(mainWidget(), 6, 2, 0, spacingHint());
+	setMainWidget(new TQWidget(this));	
+	TQGridLayout *grid = new TQGridLayout(mainWidget(), 6, 2, 0, spacingHint());
 	
-	nameLabel = new QLabel(i18n("Name:"), mainWidget());
+	nameLabel = new TQLabel(i18n("Name:"), mainWidget());
 	grid->addWidget(nameLabel, 0, 0);	
 	nameEdit = new KLineEdit(mainWidget());
 	grid->addWidget(nameEdit, 0, 1);
 	
-	QHBoxLayout *hbox = new QHBoxLayout(0, 0, spacingHint());
+	TQHBoxLayout *hbox = new TQHBoxLayout(0, 0, spacingHint());
 	grid->addMultiCellLayout(hbox, 1, 1, 0, 1);
-	namesLabel = new QLabel(mainWidget());
-	namesLabel->setAlignment(Qt::AlignRight);
-	namesLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+	namesLabel = new TQLabel(mainWidget());
+	namesLabel->setAlignment(TQt::AlignRight);
+	namesLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred);
 	hbox->addWidget(namesLabel);
-	namesButton = new QPushButton(i18n("Names Details"), mainWidget());
+	namesButton = new TQPushButton(i18n("Names Details"), mainWidget());
 	hbox->addWidget(namesButton);
 	
-	valueLabel = new QLabel(i18n("Value:"), mainWidget());
+	valueLabel = new TQLabel(i18n("Value:"), mainWidget());
 	grid->addWidget(valueLabel, 2, 0);
 	valueEdit = new KLineEdit(mainWidget());
 	grid->addWidget(valueEdit, 2, 1);
 	
-	hbox = new QHBoxLayout(0, 0, spacingHint());
+	hbox = new TQHBoxLayout(0, 0, spacingHint());
 	grid->addMultiCellLayout(hbox, 3, 3, 0, 1);
-	hbox->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
-	valueExactButton = new QCheckBox(i18n("Value is exact"), mainWidget());
+	hbox->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+	valueExactButton = new TQCheckBox(i18n("Value is exact"), mainWidget());
 	hbox->addWidget(valueExactButton);
 	
-	grid->addWidget(new QLabel(i18n("Category:"), mainWidget()), 4, 0);
+	grid->addWidget(new TQLabel(i18n("Category:"), mainWidget()), 4, 0);
 	categoryCombo = new KComboBox(mainWidget());
 	grid->addWidget(categoryCombo, 4, 1);
 	categoryCombo->setMaximumWidth(250);
 	categoryCombo->setEditable(true);
 	
-	titleLabel = new QLabel(i18n("Descriptive name:"), mainWidget());
+	titleLabel = new TQLabel(i18n("Descriptive name:"), mainWidget());
 	grid->addWidget(titleLabel, 5, 0);
 	titleEdit = new KLineEdit(mainWidget());
 	grid->addWidget(titleEdit, 5, 1);
 
 	connect(namesButton, SIGNAL(clicked()), this, SLOT(editNames()));
-	connect(nameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(nameChanged(const QString&)));
+	connect(nameEdit, SIGNAL(textChanged(const TQString&)), this, SLOT(nameChanged(const TQString&)));
 	
 }
 
@@ -166,7 +166,7 @@ void QalculateEditVariableDialog::slotOk() {
 	accept();
 }
 
-KnownVariable *QalculateEditVariableDialog::editVariable(QString category, KnownVariable *v, MathStructure *initial_value, bool force_value) {
+KnownVariable *QalculateEditVariableDialog::editVariable(TQString category, KnownVariable *v, MathStructure *initial_value, bool force_value) {
 
 	nameEdit->setFocus();
 
@@ -189,8 +189,8 @@ KnownVariable *QalculateEditVariableDialog::editVariable(QString category, Known
 
 	namesLabel->setText("");
 
-	//QStringList cats;
-	QString catstr;
+	//TQStringList cats;
+	TQString catstr;
 	categoryCombo->clear();
 	tree_struct *item, *item2;
 	variable_cats.it = variable_cats.items.begin();
@@ -271,7 +271,7 @@ KnownVariable *QalculateEditVariableDialog::editVariable(QString category, Known
 	init_value = initial_value;
 	force_init_value = force_value;
 
-	if(exec() == QDialog::Accepted) {
+	if(exec() == TQDialog::Accepted) {
 		v = edited_variable;
 		edited_variable = NULL;
 		return v;
@@ -291,7 +291,7 @@ void QalculateEditVariableDialog::editNames() {
 	names_edit_dialog->setNamesLE(nameEdit, namesLabel);
 }
 
-void QalculateEditVariableDialog::nameChanged(const QString &name) {
+void QalculateEditVariableDialog::nameChanged(const TQString &name) {
 	if(name.isNull()) return;
 	if(!CALCULATOR->variableNameIsValid(name.ascii())) {
 		nameEdit->blockSignals(true);