]> granicus.if.org Git - graphviz/commitdiff
remove commented out code in gvedit
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Thu, 13 May 2021 00:08:40 +0000 (17:08 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 19 May 2021 02:42:15 +0000 (19:42 -0700)
cmd/gvedit/csettings.cpp
cmd/gvedit/imageviewer.cpp
cmd/gvedit/imageviewer.h
cmd/gvedit/main.cpp
cmd/gvedit/mainwindow.cpp
cmd/gvedit/mdichild.cpp

index 79540e0936aaba056a8320349187481aaee183b2..a71ad21cc6652414d5a06d62572015139f750b7f 100644 (file)
@@ -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)
index a58b8d072fb439f4c993534fb8b5b09bbe9dd8c1..43482689219ca46e1ca9eab1ea4718a19b73c808 100644 (file)
@@ -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()
index 685a9769e40126291c11ee891766ee7e2d103466..3a6b789dd1404c7b247951b5695b71c448a2213e 100644 (file)
@@ -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
index 4c39d78945d61971177f6db2531e82a66bf219b5..f4a7406fcb650788f24c9deacbfbc81fddc4c51d 100644 (file)
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <QApplication>
 #include <QFile>
-/* #include <QTextStream> */
 #include "mainwindow.h"
 
 #include <getopt.h>
@@ -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?] <files>\n\
index cfebeb29a2d81de97fad0992e5077bde17d7795a..9a4ce981db5fda209703d84e653f0a1429e3e6ab 100644 (file)
@@ -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<QComboBox*>("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();
index 30a6de2cae4e88c1fba8d73fe9df1e4bf2b49576..0b520e19b5a82246b99d93daf19f98f6e5ff88ac 100644 (file)
@@ -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();