From: Matthew Fernandez Date: Thu, 13 May 2021 00:08:40 +0000 (-0700) Subject: remove commented out code in gvedit X-Git-Tag: 2.47.2~5^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69020a875cf7a620e6842a34b1a1d58b8b34d5f2;p=graphviz remove commented out code in gvedit --- diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp index 79540e093..a71ad21cc 100644 --- a/cmd/gvedit/csettings.cpp +++ b/cmd/gvedit/csettings.cpp @@ -369,12 +369,6 @@ void CFrmSettings::doPreview(QString fileName) gvRenderFilename(gvc, graph, "png", (char *) prevFile.toUtf8().constData()); getActiveWindow()->loadPreview(prevFile); -#if 0 - if (!this->getActiveWindow()->loadPreview(prevFile)) - QMessageBox::information(this, tr("GVEdit"), - tr - ("Preview file can not be opened.")); -#endif } } @@ -477,7 +471,6 @@ int CFrmSettings::drawGraph() agreseterrors(); return rc; - /* return QDialog::Rejected; */ } int CFrmSettings::runSettings(MdiChild * m) diff --git a/cmd/gvedit/imageviewer.cpp b/cmd/gvedit/imageviewer.cpp index a58b8d072..434826892 100644 --- a/cmd/gvedit/imageviewer.cpp +++ b/cmd/gvedit/imageviewer.cpp @@ -14,8 +14,6 @@ extern int errorPipe(char *errMsg); - -//! [0] ImageViewer::ImageViewer() { imageLabel = new QLabel; @@ -38,11 +36,7 @@ ImageViewer::ImageViewer() } -//! [0] - -//! [1] bool ImageViewer::open(QString fileName) -//! [1] //! [2] { if (!fileName.isEmpty()) { QImage image(fileName); @@ -64,9 +58,7 @@ void ImageViewer::print() { Q_ASSERT(imageLabel->pixmap()); #ifndef QT_NO_PRINTER -//! [6] //! [7] QPrintDialog dialog(&printer, this); -//! [7] //! [8] if (dialog.exec()) { QPainter painter(&printer); QRect rect = painter.viewport(); @@ -167,11 +159,6 @@ void ImageViewer::createActions() void ImageViewer::createMenus() { -/* fileMenu = new QMenu(tr("&File"), this); - fileMenu->addAction(printAct); - fileMenu->addSeparator(); - fileMenu->addAction(exitAct);*/ - viewMenu = new QMenu(tr("&View"), this); viewMenu->addAction(zoomInAct); viewMenu->addAction(zoomOutAct); @@ -179,14 +166,7 @@ void ImageViewer::createMenus() viewMenu->addSeparator(); viewMenu->addAction(fitToWindowAct); -/* helpMenu = new QMenu(tr("&Help"), this); - helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct);*/ - -// menuBar()->addMenu(fileMenu); menuBar()->addMenu(viewMenu); - //menuBar()->addMenu(helpMenu); - } void ImageViewer::updateActions() diff --git a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h index 685a9769e..3a6b789dd 100644 --- a/cmd/gvedit/imageviewer.h +++ b/cmd/gvedit/imageviewer.h @@ -25,7 +25,6 @@ class QScrollBar; class MdiChild; QT_END_NAMESPACE -//! [0] class ImageViewer : public QMainWindow { Q_OBJECT @@ -71,13 +70,10 @@ private: QAction *aboutAct; QAction *aboutQtAct; -// QMenu *fileMenu; QMenu *viewMenu; -// QMenu *helpMenu; protected: void closeEvent(QCloseEvent *event); }; -//! [0] #endif diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp index 4c39d7894..f4a7406fc 100644 --- a/cmd/gvedit/main.cpp +++ b/cmd/gvedit/main.cpp @@ -16,7 +16,6 @@ #include #include #include -/* #include */ #include "mainwindow.h" #include @@ -25,7 +24,6 @@ #ifdef _WIN32 -/*gvc.lib cgraph.lib*/ #pragma comment( lib, "cgraph.lib" ) #pragma comment( lib, "gvc.lib" ) #pragma comment( lib, "ingraphs.lib" ) @@ -34,8 +32,6 @@ static char *cmd; -//extern int Verbose; - QTextStream errout(stderr, QIODevice::WriteOnly); static char useString[] = "Usage: gvedit [-v?] \n\ diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp index cfebeb29a..9a4ce981d 100644 --- a/cmd/gvedit/mainwindow.cpp +++ b/cmd/gvedit/mainwindow.cpp @@ -71,14 +71,11 @@ void CMainWindow::createConsole() dock-> setAllowedAreas(Qt::BottomDockWidgetArea | Qt::TopDockWidgetArea); -// dock->setWidget(textEdit); addDockWidget(Qt::BottomDockWidgetArea, dock); QVBoxLayout *vL = new QVBoxLayout(); textEdit->setObjectName(QString::fromUtf8("textEdit")); -/* textEdit->setMinimumSize(QSize(0, 80)); - textEdit->setMaximumSize(QSize(16777215, 120));*/ globTextEdit = textEdit; agseterrf(errorPipe); @@ -138,11 +135,6 @@ CMainWindow::CMainWindow(char*** Files) createConsole(); - - - - - connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(slotRefreshMenus())); windowMapper = new QSignalMapper(this); @@ -163,7 +155,6 @@ CMainWindow::CMainWindow(char*** Files) this->resize(1024, 900); this->move(0, 0); setUnifiedTitleAndToolBarOnMac(true); -// (QComboBox*)frmSettings->findChild("cbLayout") QComboBox *cb = (QComboBox *) frmSettings->findChild < QComboBox * >("cbLayout"); dfltLayoutIdx = LoadPlugins(cb, frmSettings->gvc, "layout", NULL, "dot"); @@ -180,9 +171,6 @@ CMainWindow::CMainWindow(char*** Files) addFile(QString(*files)); files++; } - - - } void CMainWindow::closeEvent(QCloseEvent * event) @@ -229,10 +217,8 @@ void CMainWindow::slotOpen() filters << "*.cpp" << "*.cxx" << "*.cc"; QFileDialog fd; -// fd.setProxyModel(new FileFilterProxyModel()); fd.setNameFilter("XML (*.xml)"); QString fileName = fd.getOpenFileName(this); -// QFileDialog::getOpenFileName(this); addFile(fileName); } @@ -299,21 +285,12 @@ void CMainWindow::slotRun(MdiChild * m) { setChild (); - - -// if ((activeMdiChild()) && (!activeMdiChild()->firstTime())) if(m) frmSettings->runSettings(m); else frmSettings->runSettings(activeMdiChild()); -// if ((activeMdiChild()) && (activeMdiChild()->firstTime())) -// frmSettings->showSettings(activeMdiChild()); - - } - - void CMainWindow::slotNewLog() { globTextEdit->clear(); diff --git a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp index 30a6de2ca..0b520e19b 100644 --- a/cmd/gvedit/mdichild.cpp +++ b/cmd/gvedit/mdichild.cpp @@ -94,8 +94,6 @@ bool MdiChild::saveFile(const QString & fileName) QTextStream out(&file); QApplication::setOverrideCursor(Qt::WaitCursor); -// out << toPlainText(); -// out << toPlainText().toUtf8().constData(); out.setCodec("UTF-8"); out << toPlainText(); out.flush();