From 02e94228844f702ef6d7e670af6a2138620e2eb4 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Sat, 14 Dec 2013 08:14:03 +0100 Subject: [PATCH] I've removed all reference to QMap widget. --- mainwindow.cpp | 14 +++++++------- mainwindow.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index b7146f4..af4a404 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -120,18 +120,18 @@ void MainWindow::quit(){ } CLabel* MainWindow::addWidget(const QString &key, CLabel * a){ - widget.insert(key, a); + //widget.insert(key, a); int maxc=conf->value(QString("maxcolumn")).toInt(); grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter); QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map())); signalmap->setMapping(a, key); return a; } -void MainWindow::remWidget(const QString & a){ +/*void MainWindow::remWidget(const QString & a){ QObject::disconnect(widget.value(a), SIGNAL(released()), signalmap, SLOT(map())); grid->removeWidget(widget.value(a)); - widget.remove(a); -} + //widget.remove(a); +}*/ void MainWindow::action(const QString & a){ qDebug()<<"action("<setText(a); @@ -176,7 +176,7 @@ void MainWindow::flush(){ delete child->widget(); delete child; } - widget.clear(); + //widget.clear(); } CLabel::CLabel( const QString& text, QWidget * parent ) : QLabel(parent) { @@ -211,9 +211,9 @@ void MainWindow::debug(int col){ q->next(); } } -QString MainWindow::getText(const QString &a){ +/*QString MainWindow::getText(const QString &a){ return widget.value(a)->text(); -} +}*/ void MainWindow::connectDB(){ db = QSqlDatabase::addDatabase("QSQLITE"); //db = QSqlDatabase::addDatabase("QPSQL"); diff --git a/mainwindow.h b/mainwindow.h index 9521cf5..4f741ac 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -56,7 +56,7 @@ public: void showExpanded(); CLabel* addWidget(const QString &, CLabel *); - void remWidget(const QString &); + //void remWidget(const QString &); private slots: void start(); void quit(); @@ -68,7 +68,7 @@ private slots: void debug(int); //void connected(); //void TCPerrors(QAbstractSocket::SocketError); - QString getText(const QString &); + //QString getText(const QString &); void connectDB(); void firstrun(); QString &get(int, int); @@ -96,7 +96,7 @@ private: QMenu *FileMenu, *EditMenu, *HelpMenu; unsigned short int port;// j'ai lu les docs sur internet et 0<="unsigned short int"<65536 QSignalMapper *signalmap; - QMap widget; + //QMap widget; QSqlDatabase db; QSqlQuery *q; //QSqlRecord r; -- 2.45.1