Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/abb/ABBConfig.cpp b/src/abb/ABBConfig.cpp
- index 6f55ce7..6522cdc 100755
- --- a/src/abb/ABBConfig.cpp
- +++ b/src/abb/ABBConfig.cpp
- @@ -134,7 +134,7 @@ int ABBConfig::readSystemFile(const QString &systemFile) {
- if (!node_SystemProperties || !node_SystemProperties->ToElement())
- return 1;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- tinyxml2::XMLNode *node_SystemName = node_SystemProperties->FirstChildElement("SystemName");
- tinyxml2::XMLNode *node_SerialNo = node_SystemProperties->FirstChildElement("SerialNo");
- @@ -145,7 +145,7 @@ int ABBConfig::readSystemFile(const QString &systemFile) {
- if ( node_SerialNo && node_SerialNo->ToElement() )
- setSerialNo( node_SerialNo->ToElement()->GetText() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -186,7 +186,7 @@ int ABBConfig::readPNIODriver(const QString &absolutePath) {
- if (!node_IPPNIO ||!node_IPPNIO->ToElement())
- return 1;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- tinyxml2::XMLNode *node_CtlrParas = node_IPPNIO->FirstChildElement("CtlrParas");
- if (node_CtlrParas) {
- @@ -312,7 +312,7 @@ int ABBConfig::readPNIODriver(const QString &absolutePath) {
- busDevTreeRoot->addChildren(items);
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- diff --git a/src/abb/ABBSimpleViewer.cpp b/src/abb/ABBSimpleViewer.cpp
- index 9382e80..2722988 100755
- --- a/src/abb/ABBSimpleViewer.cpp
- +++ b/src/abb/ABBSimpleViewer.cpp
- @@ -135,7 +135,7 @@ bool ABBSimpleViewer::save(const QString &fileName) {
- return false;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // expand all folds
- PlainEditor *plainEditor = (PlainEditor *) getEditor();
- @@ -163,7 +163,7 @@ bool ABBSimpleViewer::save(const QString &fileName) {
- getEditor()->update();
- refreshMarkers();
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- int row = editor->textCursor().blockNumber();
- @@ -209,13 +209,13 @@ bool ABBSimpleViewer::save(const QString &fileName) {
- QFile file(fileName);
- if (!file.open(QFile::WriteOnly | QFile::Text | QFile::Truncate)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("Cannot write file %1:\n%2")
- .arg(fileName).arg(file.errorString()));
- return false;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream outStream(&file);
- @@ -242,7 +242,7 @@ bool ABBSimpleViewer::save(const QString &fileName) {
- getEditor()->document()->setModified(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- @@ -410,7 +410,7 @@ int ABBSimpleViewer::setFilteredSrc() {
- }
- // --- Parse text ---------------------------------------
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp point_rx("robtarget\\s+[a-z0-9_]+", Qt::CaseInsensitive);
- QRegExp tool_rx("tooldata\\s+[a-z0-9_]+", Qt::CaseInsensitive);
- @@ -451,7 +451,7 @@ int ABBSimpleViewer::setFilteredSrc() {
- editor->blockSignals(false);
- editor->document()->blockSignals(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return Common::randInt(0, 1000);
- }
- diff --git a/src/abb/ABBSimpleViewer.h b/src/abb/ABBSimpleViewer.h
- index 786a0d4..da8f4c2 100755
- --- a/src/abb/ABBSimpleViewer.h
- +++ b/src/abb/ABBSimpleViewer.h
- @@ -199,7 +199,7 @@ class DRESCORE_EXPORT ABBSimpleViewer : public SimpleViewer {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- return false;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // -Name "diSPS_FrgStellung17" -SignalType "DI" -Device "SPS"
- // -Label "(E64) Stellungsfreigabe 17 Rob < Anlage" -DeviceMap "63"
- @@ -256,7 +256,7 @@ class DRESCORE_EXPORT ABBSimpleViewer : public SimpleViewer {
- }
- progress.setValue( fileInfo.size() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- diff --git a/src/abb/ABBToolBox.cpp b/src/abb/ABBToolBox.cpp
- index 673434c..c70b2aa 100755
- --- a/src/abb/ABBToolBox.cpp
- +++ b/src/abb/ABBToolBox.cpp
- @@ -68,7 +68,7 @@ void ABBToolBox::comment() {
- blockList << cursor.block();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp indent_rx("^\\s*");
- QRegExp commentStart_rx("^\\s*!");
- @@ -109,7 +109,7 @@ void ABBToolBox::comment() {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- diff --git a/src/core/HASP.cpp b/src/core/HASP.cpp
- index 7383f36..4f605ed 100755
- --- a/src/core/HASP.cpp
- +++ b/src/core/HASP.cpp
- @@ -250,8 +250,8 @@ hasp_status_t checkOnlineManagerLicense(int featureNo, bool silent) {
- hasp_status_t status = HASP_NEXT_FREE_VALUES;
- - if (!silent)
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- +// if (!silent)
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QString uid;
- @@ -453,8 +453,8 @@ hasp_status_t checkOnlineManagerLicense(int featureNo, bool silent) {
- << ") :" << errString;
- }
- - if (!silent)
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- +// if (!silent)
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- reply->disconnect();
- delete reply;
- diff --git a/src/fanuc/FanucConfig.cpp b/src/fanuc/FanucConfig.cpp
- index 4e12134..7217fbd 100755
- --- a/src/fanuc/FanucConfig.cpp
- +++ b/src/fanuc/FanucConfig.cpp
- @@ -163,7 +163,7 @@ int FanucConfig::readVersionFile(const QDir &absolutePath) {
- return 2;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // [VERSION]ROB_NAME Storage: DRAM Access: RW : STRING[32] = 'K1U2A1232895R03'
- QRegExp rob_name_rx("ROB_NAME", Qt::CaseInsensitive);
- @@ -217,7 +217,7 @@ int FanucConfig::readVersionFile(const QDir &absolutePath) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- diff --git a/src/fanuc/FanucSimpleViewer.cpp b/src/fanuc/FanucSimpleViewer.cpp
- index 1084426..be73618 100755
- --- a/src/fanuc/FanucSimpleViewer.cpp
- +++ b/src/fanuc/FanucSimpleViewer.cpp
- @@ -281,7 +281,7 @@ int FanucSimpleViewer::setFilteredSrc() {
- }
- // --- Parse text ---------------------------------------
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QString s_indent = getIndentation();
- QRegExp motion_rx(":\\s*(J|L)\\s+P\\[\\s*\\d+\\s*(:[^\\]]*)?\\]", Qt::CaseInsensitive);
- @@ -580,7 +580,7 @@ int FanucSimpleViewer::setFilteredSrc() {
- editor->moveCursor(QTextCursor::Start);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return Common::randInt(0, 1000);
- }
- diff --git a/src/fanuc/FanucSimpleViewer.h b/src/fanuc/FanucSimpleViewer.h
- index fcf3573..b3c27b9 100755
- --- a/src/fanuc/FanucSimpleViewer.h
- +++ b/src/fanuc/FanucSimpleViewer.h
- @@ -237,7 +237,7 @@ class DRESCORE_EXPORT FanucSimpleViewer : public SimpleViewer {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- return false;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp rx("IO_COMMENT_(DI|DO|AI|AO|RI|RO|GI|GO|F|M)\\-\\d+", Qt::CaseInsensitive);
- fanucLongTextTable.clear();
- @@ -283,7 +283,7 @@ class DRESCORE_EXPORT FanucSimpleViewer : public SimpleViewer {
- }
- progress.setValue( fileInfo.size() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- diff --git a/src/fanuc/FanucToolBox.cpp b/src/fanuc/FanucToolBox.cpp
- index 70b9ddb..fd4133f 100755
- --- a/src/fanuc/FanucToolBox.cpp
- +++ b/src/fanuc/FanucToolBox.cpp
- @@ -69,7 +69,7 @@ void FanucToolBox::comment() {
- blockList << cursor.block();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp indent_rx("^\\s*");
- QRegExp commentStart_rx("^\\s*!");
- @@ -114,5 +114,5 @@ void FanucToolBox::comment() {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- diff --git a/src/gui/LongTextWidget.cpp b/src/gui/LongTextWidget.cpp
- index ab31857..43e1634 100755
- --- a/src/gui/LongTextWidget.cpp
- +++ b/src/gui/LongTextWidget.cpp
- @@ -576,19 +576,19 @@ int LongTextWidget::readKukaWVS(const QString &fileName,
- return -1;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QProcess p1;
- p1.start(fileInfo.absoluteFilePath(), QStringList() << fileName << outDir.path());
- if ( !p1.waitForStarted(10000) ) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- if (!silent)
- QMessageBox::warning(this, title, tr("Could not run process") );
- return -1;
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QProgressDialog progress;
- progress.setWindowTitle(title);
- @@ -1087,7 +1087,7 @@ void LongTextWidget::exportToFile() {
- return;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- lastFile = fileName;
- sett.setValue(APP_LAST_OPEN_DIRECTORY,
- @@ -1123,7 +1123,7 @@ void LongTextWidget::exportToFile() {
- out.flush();
- file.close();
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // exportButton->setDisabled(true);
- }
- diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
- index 31ba856..3618d3f 100755
- --- a/src/gui/MainWindow.cpp
- +++ b/src/gui/MainWindow.cpp
- @@ -328,7 +328,7 @@ void MainWindow::init() {
- void MainWindow::show() {
- QMainWindow::show();
- QApplication::processEvents();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QSettings sett(QSettings::IniFormat, QSettings::UserScope, APP_ORGANIZATION, APP_NAME);
- @@ -342,9 +342,9 @@ void MainWindow::show() {
- QSettings sett(QSettings::IniFormat, QSettings::UserScope, APP_ORGANIZATION, APP_NAME);
- QString session = sett.value(APP_LAST_SESSION).toString();
- statusBar()->showMessage(tr("Restoring last session. Please wait..."), 3000);
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- menu->restoreSession(session);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- });
- timer->start(1000);
- @@ -353,7 +353,7 @@ void MainWindow::show() {
- // restore last loaded long text file
- longTextWidget->restore();
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- geolocation();
- isSelfCall = true;
- diff --git a/src/gui/MenuBar.cpp b/src/gui/MenuBar.cpp
- index ed4fac8..9b73d27 100755
- --- a/src/gui/MenuBar.cpp
- +++ b/src/gui/MenuBar.cpp
- @@ -2476,7 +2476,7 @@ void MenuBar::openZipFile(const QString &fileName, QProgressDialog *progress) {
- tempDirList << tempPath; // remove temporary directory when app close
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- Unzip file ---
- QStringList files = JlCompress::extractDir(fileName, tempPath);
- @@ -2523,7 +2523,7 @@ void MenuBar::openZipFile(const QString &fileName, QProgressDialog *progress) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- if (unknownZIP) {
- // remove unpacked files recursively
- @@ -4196,7 +4196,7 @@ void MenuBar::findReplace(bool prevKeyword) {
- } else if (!foundKeyword && findOpt.listWhenFinished)
- return;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- foreach (QMdiSubWindow *window, windows) {
- rewind = false;
- @@ -4332,7 +4332,7 @@ void MenuBar::findReplace(bool prevKeyword) {
- }
- exit:
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- if (foundKeyword && findOpt.listWhenFinished)
- foundKeyword->show();
- @@ -5090,7 +5090,7 @@ void MenuBar::TPVWchanged() {
- VKRCSimpleViewer::setVWSoft(version);
- TPVWrefresh(CONFIG_TYPE_VKRC);
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- if (workspace)
- foreach (QMdiSubWindow *window, workspace->subWindowList()) {
- @@ -5116,7 +5116,7 @@ void MenuBar::TPVWchanged() {
- viewer->checkBasicSyntax();
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- diff --git a/src/gui/PlainEditor.cpp b/src/gui/PlainEditor.cpp
- index fb75e31..861f90f 100755
- --- a/src/gui/PlainEditor.cpp
- +++ b/src/gui/PlainEditor.cpp
- @@ -311,7 +311,7 @@ void PlainEditor::keyReleaseEvent(QKeyEvent *event) {
- if (event->key() == Qt::Key_Control) {
- setMouseTracking(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- highlightCurrentLine();
- }
- @@ -460,7 +460,7 @@ void PlainEditor::mousePressEvent(QMouseEvent *event) {
- if (!fileName.isEmpty() && !varName.isEmpty() && line == -1) {
- // Open a new file
- setMouseTracking(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- highlightCurrentLine();
- emit gotoVariableReferenceFile(fileName + ";" + varName);
- @@ -484,7 +484,7 @@ void PlainEditor::mouseMoveEvent(QMouseEvent *event) {
- if ( !(eventFlag & PlainEditor::MouseMove) ) return;
- QPlainTextEdit::mouseMoveEvent(event);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- if (hasViewer() && (event->modifiers() & Qt::ControlModifier)) {
- int line;
- @@ -508,7 +508,7 @@ void PlainEditor::mouseMoveEvent(QMouseEvent *event) {
- cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
- }
- - QApplication::setOverrideCursor(Qt::PointingHandCursor);
- + //QApplication::setOverrideCursor(Qt::PointingHandCursor);
- QTextEdit::ExtraSelection selection;
- selection.cursor = cursor;
- @@ -1012,7 +1012,7 @@ void PlainEditor::removeViewer(bool restore) {
- }
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- ColorizedScrollBar *vertical = (ColorizedScrollBar *) verticalScrollBar();
- if (vertical)
- @@ -1045,7 +1045,7 @@ void PlainEditor::removeViewer(bool restore) {
- emit message("");
- emit updateMenu();
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- diff --git a/src/gui/TextEditor.cpp b/src/gui/TextEditor.cpp
- index 2d6ac12..af4daf8 100755
- --- a/src/gui/TextEditor.cpp
- +++ b/src/gui/TextEditor.cpp
- @@ -302,7 +302,7 @@ bool TextEditor::saveFile(const QString &fileName) {
- } else
- fileWatcher.addPaths(watcherFiles);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return ret;
- } else {
- @@ -319,7 +319,7 @@ bool TextEditor::saveFile(const QString &fileName) {
- QStringList watched = fileWatcher.files();
- fileWatcher.removePaths(watched);
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream out(&file);
- @@ -353,7 +353,7 @@ bool TextEditor::saveFile(const QString &fileName) {
- #endif
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- }
- @@ -370,7 +370,7 @@ bool TextEditor::openFile(const QString &fileName) {
- }
- // ------------------------------------------------------
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QSettings sett(QSettings::IniFormat, QSettings::UserScope, APP_ORGANIZATION, APP_NAME);
- @@ -641,7 +641,7 @@ bool TextEditor::openFile(const QString &fileName) {
- setHighlighter(syntax);
- // ------------------------------------------------------
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- diff --git a/src/vkrc/VKRCConfig.cpp b/src/vkrc/VKRCConfig.cpp
- index b9ebd7f..7291814 100755
- --- a/src/vkrc/VKRCConfig.cpp
- +++ b/src/vkrc/VKRCConfig.cpp
- @@ -818,7 +818,7 @@ int VKRCConfig::readFromFile(const QString &fname) throw (VKRCInconsistentPointD
- return 2;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QStringList lines = in.readAll().split(QRegExp("\n"));
- @@ -1096,7 +1096,7 @@ int VKRCConfig::readFromFile(const QString &fname) throw (VKRCInconsistentPointD
- }
- loaded = true;
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -1133,7 +1133,7 @@ int VKRCConfig::saveToFile() const {
- return -3;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&fileIn);
- QString textAll = in.readAll();
- @@ -1235,7 +1235,7 @@ int VKRCConfig::saveToFile() const {
- if (!fileOut.open(QFile::WriteOnly | QFile::Text | QIODevice::Truncate)) {
- QMessageBox::warning(0, QObject::tr("Warning"),
- QObject::tr("Cannot write file %1:\n%2").arg(fileNameOut).arg(fileOut.errorString()));
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return -4;
- }
- @@ -1244,7 +1244,7 @@ int VKRCConfig::saveToFile() const {
- out << textAll;
- fileOut.close();
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -1302,7 +1302,7 @@ int VKRCConfig::readKLIConfig(const QString &absolutePath) {
- QFile file(KLIConfig);
- if (file.open(QFile::ReadOnly | QFile::Text)) {
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QString xmlString = in.readAll();
- @@ -1363,7 +1363,7 @@ int VKRCConfig::readKLIConfig(const QString &absolutePath) {
- reader.skipCurrentElement();
- } // readNextStartElement
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- } else
- return 1;
- @@ -1435,7 +1435,7 @@ int VKRCConfig::readPNIODriver(const QString &absolutePath) {
- file.setFileName(PNIODriver);
- if (file.open(QFile::ReadOnly | QFile::Text)) {
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QString xmlString = in.readAll();
- @@ -1524,7 +1524,7 @@ int VKRCConfig::readPNIODriver(const QString &absolutePath) {
- busDevTreeRoot->addChildren(items);
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- @@ -1539,7 +1539,7 @@ int VKRCConfig::readPNIODriver(const QString &absolutePath) {
- file.setFileName(IPPNIO);
- if (file.open(QFile::ReadOnly | QFile::Text)) {
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QString xmlString = in.readAll();
- @@ -1655,7 +1655,7 @@ int VKRCConfig::readPNIODriver(const QString &absolutePath) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- return 0;
- @@ -1712,7 +1712,7 @@ int VKRCConfig::readCameraIPs(const QString &absolutePath) {
- cameraIPs.clear();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- foreach(QString fileName, list) {
- QString xmlConfig = path.absolutePath() + QDir::separator() + fileName;
- @@ -1764,7 +1764,7 @@ int VKRCConfig::readCameraIPs(const QString &absolutePath) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -1820,7 +1820,7 @@ int VKRCConfig::readCalData(const QString &absolutePath) {
- if ( iniFile.status() != QSettings::NoError) return 1;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- AbsolutMotorValues -----------------------------------------
- @@ -1955,7 +1955,7 @@ int VKRCConfig::readCalData(const QString &absolutePath) {
- iniFile.endGroup();
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -1974,7 +1974,7 @@ int VKRCConfig::readAmFile(const QString &absolutePath) {
- if (!file.open(QFile::ReadOnly | QFile::Text))
- return 1;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QStringList lines = in.readAll().split(QRegExp("\n"));
- @@ -2040,7 +2040,7 @@ int VKRCConfig::readAmFile(const QString &absolutePath) {
- setAm(am + tech);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -2080,7 +2080,7 @@ int VKRCConfig::readConfigFile(const QString &absolutePath) {
- return ret;
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox *box = new QMessageBox();
- box->setIcon(QMessageBox::Warning);
- @@ -2117,11 +2117,11 @@ int VKRCConfig::readWVUserVersion(const QString &absolutePath) {
- QFileInfo fInfo( path.absolutePath() + QDir::separator() + list.first() );
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QString version = VKRCCommon::versionString( fInfo.absoluteFilePath() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- bool ok = false;
- @@ -2249,7 +2249,7 @@ int VKRCConfig::readRobCoreFile(const QString &absolutePath) {
- return 1;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QStringList lines = in.readAll().split(QRegExp("\n"));
- @@ -2270,7 +2270,7 @@ int VKRCConfig::readRobCoreFile(const QString &absolutePath) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return 0;
- }
- @@ -2305,7 +2305,7 @@ int VKRCConfig::readMachineFile(const QString &absolutePath) {
- return 1;
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QTextStream in(&file);
- QStringList lines = in.readAll().split(QRegExp("\n"));
- @@ -2548,7 +2548,7 @@ int VKRCConfig::readMachineFile(const QString &absolutePath) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- kinematic.set = ROBROOT_ok && ERSYSROOT_ok &&
- TIRORO_ok && TFLWP_ok && TX3P3_ok &&
- diff --git a/src/vkrc/VKRCEventFilter.cpp b/src/vkrc/VKRCEventFilter.cpp
- index 34b289c..db0153c 100755
- --- a/src/vkrc/VKRCEventFilter.cpp
- +++ b/src/vkrc/VKRCEventFilter.cpp
- @@ -1166,7 +1166,7 @@ start:
- block = begin;
- checkOne = true;
- } else {
- -// QApplication::setOverrideCursor(Qt::WaitCursor);
- +// //QApplication::setOverrideCursor(Qt::WaitCursor);
- block = viewer->getFirstBlock();
- checkOne = false;
- }
- @@ -1738,5 +1738,5 @@ skip:
- viewer->getEditor()->update();
- return VKRCCommon::randInt(0, 1000);
- -// QApplication::setOverrideCursor(Qt::ArrowCursor);
- +// //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- diff --git a/src/vkrc/VKRCMountShare.cpp b/src/vkrc/VKRCMountShare.cpp
- index f09bd94..4c6bec9 100755
- --- a/src/vkrc/VKRCMountShare.cpp
- +++ b/src/vkrc/VKRCMountShare.cpp
- @@ -264,7 +264,7 @@ void VKRCMountShare::mount() {
- // sudo mount -t cifs //172.2.218.215/Roboter /mnt/kafka1416060r01rs--kux -o user=$USER,password=$PASS,file_mode=0777,dir_mode=0777
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- buttonBox->setDisabled(true);
- while ( buttonBox->isEnabled()) ;
- @@ -402,7 +402,7 @@ void VKRCMountShare::mount() {
- }
- exit:
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- buttonBox->setDisabled(false);
- return;
- @@ -430,7 +430,7 @@ exit:
- }
- // --- run mount command ---
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- buttonBox->setDisabled(true);
- while ( buttonBox->isEnabled()) ;
- @@ -503,7 +503,7 @@ exit:
- exit:
- buttonBox->setDisabled(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- #endif
- }
- @@ -633,7 +633,7 @@ void VKRCMountShare::unmountOne() {
- bool VKRCMountShare::unmount(const QString &point) {
- #ifdef Q_OS_LINUX
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- buttonBox->setDisabled(true);
- while ( buttonBox->isEnabled()) ;
- @@ -660,13 +660,13 @@ bool VKRCMountShare::unmount(const QString &point) {
- }
- exit:
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- buttonBox->setDisabled(false);
- return ret;
- #elif defined(Q_OS_WIN32)
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- buttonBox->setDisabled(true);
- while ( buttonBox->isEnabled() ) ;
- @@ -678,12 +678,12 @@ exit:
- // Timeout set to 10 sec
- if (!p1.waitForFinished(10000)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Mount share"), tr("Timeout %1").arg(cmd));
- ret = false;
- goto exit;
- } else {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QByteArray p_stderr = p1.readAllStandardError();
- if ( p_stderr.length() ) {
- @@ -703,7 +703,7 @@ exit:
- exit:
- buttonBox->setDisabled(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- buildWindowsDrivers();
- return ret;
- #endif
- diff --git a/src/vkrc/VKRCSimpleViewer.cpp b/src/vkrc/VKRCSimpleViewer.cpp
- index 93f01fe..839a915 100755
- --- a/src/vkrc/VKRCSimpleViewer.cpp
- +++ b/src/vkrc/VKRCSimpleViewer.cpp
- @@ -178,7 +178,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- setVWSoft(VW_VSOFT_8_1_X);
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- Get TXT file ---------------------------------------------------------
- QTextBlock block = editor->document()->firstBlock();
- @@ -202,7 +202,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- txtStr += "END\n";
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- @@ -222,7 +222,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- txtStr += "END\n";
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- @@ -293,18 +293,18 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- connect(&msgParser, SIGNAL(expand(QTextCursor&, bool)),
- this, SLOT(collapsOrExpand(QTextCursor&, bool)));
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- msgParser.exec();
- if (msgParser.result() == QMessageBox::AcceptRole) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- return false;
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // --- Create DAT file if required ------------------------------------------
- QString datStr;
- @@ -316,7 +316,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
- if (ret == QMessageBox::Yes) {
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- createDat = true;
- @@ -346,7 +346,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- datStr += parser.getDatCoord(docType);
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- @@ -360,7 +360,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- }
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- Get postfix and suffix for backup file -------------------------------
- QString prefix, suffix;
- @@ -398,7 +398,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- QFile fileTxt(txtFile);
- if (!fileTxt.open(QFile::WriteOnly | QFile::Text)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- QMessageBox::warning(0, tr("Warning"), tr("Cannot write file %1:\n%2")
- @@ -424,7 +424,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- QFile fileDAT(datFile);
- if (!fileDAT.open(QFile::WriteOnly | QFile::Text)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- QMessageBox::warning(0, tr("Warning"), tr("Cannot write file %1:\n%2")
- @@ -445,7 +445,7 @@ bool VKRCSimpleViewer::exportToTxt(const QString fileName) {
- fileDAT.close();
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // setVWSoft(prevTPVWsoft);
- return true;
- }
- @@ -479,7 +479,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- }
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- Create VKRC parser instance ------------------------------------------
- VKRCParser parser(docType);
- @@ -507,7 +507,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- srcStr += parser.getSrcLocations(block, docType, pointList);
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- QMessageBox::Ok, QMessageBox::Ok);
- return false;
- @@ -526,7 +526,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- srcStr += parser.getSrcMakro(block, docType);
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- QMessageBox::Ok, QMessageBox::Ok);
- return false;
- @@ -535,7 +535,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- srcStr += parser.getMainFoldEnd(docType); // End of main Fold
- } else {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::information(0, tr("File type not suported"),
- tr("We are sorry but this file type is not suported yet."));
- return false;
- @@ -600,19 +600,19 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- connect(&msgParser, SIGNAL(expand(QTextCursor&, bool)),
- this, SLOT(collapsOrExpand(QTextCursor&, bool)));
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- msgParser.setWindowTitle( msgParser.windowTitle() + " - " +
- QFileInfo(refDoc).fileName() );
- msgParser.exec();
- if (msgParser.result() == QMessageBox::AcceptRole) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return false;
- }
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // --- Get DAT file ---------------------------------------------------------
- // --- only if the reference file is UP or Folge create DAT file ---
- @@ -643,7 +643,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- datStr += parser.getDatCoord(docType);
- } catch (VKRCInconsistentPointDataException &e) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("%1").arg(e.what()),
- QMessageBox::Ok, QMessageBox::Ok);
- return false;
- @@ -691,7 +691,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- QFile fileSRC(srcFile);
- if (!fileSRC.open(QFile::WriteOnly | QFile::Text | QFile::Truncate)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("Cannot write file %1:\n%2")
- .arg(srcFile).arg(fileSRC.errorString()));
- return false;
- @@ -715,7 +715,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- QFile fileDAT(datFile);
- if (!fileDAT.open(QFile::WriteOnly | QFile::Text | QFile::Truncate)) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("Cannot write file %1:\n%2")
- .arg(datFile).arg(fileDAT.errorString()));
- return false;
- @@ -766,7 +766,7 @@ bool VKRCSimpleViewer::save(const QString &fileName) {
- checkFullSyntax(false);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- @@ -1327,7 +1327,7 @@ int VKRCSimpleViewer::readPointList(const QString &fileName) {
- return VKRCCommon::randInt(0, 1000);
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp rx_p_data(VKRCPointData::REGEXP_PATTERN);
- QRegExp rx_p_coor(VKRCPointCoord::REGEXP_PATTERN);
- @@ -1396,7 +1396,7 @@ int VKRCSimpleViewer::readPointList(const QString &fileName) {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return VKRCCommon::randInt(0, 1000);
- }
- @@ -1576,7 +1576,7 @@ int VKRCSimpleViewer::setFilteredSrc() {
- QRegExp fold_rx(";\\s*FOLD[^\\n]+", Qt::CaseInsensitive);
- QRegExp comment_rx(";\\s*FOLD\\s+\\-\\-.*\\-\\-\\s*;\\s*%", Qt::CaseInsensitive);
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // clear old line mapping viewer <-> source text
- @@ -2106,7 +2106,7 @@ skip:
- editor->moveCursor(QTextCursor::Start);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return VKRCCommon::randInt(0, 1000);
- }
- @@ -2996,7 +2996,7 @@ void VKRCSimpleViewer::paste(QPlainTextEdit *editor) {
- }
- }
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- int foldCounter = 0;
- while ( reader.readNextStartElement() ) {
- @@ -3208,7 +3208,7 @@ void VKRCSimpleViewer::paste(QPlainTextEdit *editor) {
- idx = ((VKRCPathPoint) pointList.last()).getPointData().index() + 1;
- if (idx > 65535) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"),
- tr("Number of points exceeded"));
- return;
- @@ -3320,12 +3320,12 @@ void VKRCSimpleViewer::paste(QPlainTextEdit *editor) {
- } // readNextStartElement
- if (reader.hasError()) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"),
- tr("The VKRC XML MimeData is not well-formed: %1").arg(reader.errorString()));
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- } else {
- @@ -4691,7 +4691,7 @@ int VKRCSimpleViewer::assignCoord(int blockNumber) {
- idx = ((VKRCPathPoint) pointList.last()).getPointData().index() + 1;
- if (idx > 65535) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, tr("Warning"), tr("Number of points exceeded"));
- return VKRCCommon::randInt(1, 1000);
- }
- diff --git a/src/vkrc/VKRCSimpleViewer.h b/src/vkrc/VKRCSimpleViewer.h
- index 4207684..6e56f3c 100755
- --- a/src/vkrc/VKRCSimpleViewer.h
- +++ b/src/vkrc/VKRCSimpleViewer.h
- @@ -493,7 +493,7 @@ class DRESCORE_EXPORT VKRCSimpleViewer : public SimpleViewer {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- return false;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp var_rx("^(T|I|F|M|ANAIN|ANA|E|A|BININ|BIN|P|MAKRO|UP)\\s?\\d+", Qt::CaseInsensitive);
- kukaLongTextTable.clear();
- @@ -539,7 +539,7 @@ class DRESCORE_EXPORT VKRCSimpleViewer : public SimpleViewer {
- fileName, LongTextWidget::LONGTEXT_FORMAT_KUKA);
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- @@ -556,7 +556,7 @@ class DRESCORE_EXPORT VKRCSimpleViewer : public SimpleViewer {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
- return false;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp rx("^(T|I|F|M|ANAIN|ANA|E|A|BININ|BIN|P)\\s?\\d+", Qt::CaseInsensitive);
- kukaLongTextTable.clear();
- @@ -595,7 +595,7 @@ class DRESCORE_EXPORT VKRCSimpleViewer : public SimpleViewer {
- }
- progress.setValue( fileInfo.size() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- return true;
- }
- diff --git a/src/vkrc/VKRCToolBox.cpp b/src/vkrc/VKRCToolBox.cpp
- index e05bb0e..242dbf4 100755
- --- a/src/vkrc/VKRCToolBox.cpp
- +++ b/src/vkrc/VKRCToolBox.cpp
- @@ -53,12 +53,12 @@ void VKRCToolBox::importSarchive() {
- QString tempPath = tempDir.path();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- // Unzip file S-Archive
- QStringList files = JlCompress::extractDir(fileName, tempPath);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- int vw_usr_s = files.indexOf( QRegExp(".*vw_usr_s\\.src", Qt::CaseInsensitive) );
- @@ -66,11 +66,11 @@ void VKRCToolBox::importSarchive() {
- QFileInfo fInfo( files.at(vw_usr_s) );
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QString version = VKRCCommon::versionString( fInfo.absoluteFilePath() );
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- bool ok = false;
- @@ -571,7 +571,7 @@ void VKRCToolBox::addFBPSPS() {
- QString lastPreviousActiveFB; // the last FB from point previous
- int idx = 0;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- foreach (QMdiSubWindow *window, workspace->subWindowList()) {
- @@ -750,7 +750,7 @@ skip:
- if (onlyCurrFile) break;
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- @@ -778,7 +778,7 @@ void VKRCToolBox::setGenauKLIN() {
- // QProgressDialog *progress = new QProgressDialog(labelText, tr("Cancel"), 0, 0, 0);
- // progress->setWindowTitle(tr("KLIN Genau"));
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- while ( block.isValid() ) {
- @@ -854,7 +854,7 @@ void VKRCToolBox::setGenauKLIN() {
- // viewer->getEditor()->document()->blockSignals(false);
- // viewer->getEditor()->document()->modificationChanged(true);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- @@ -996,7 +996,7 @@ void VKRCToolBox::enumerateSchaltpunkt() {
- bin9 = bin9Spin.value();
- bin7 = bin7Spin.value();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp bin11_rx("^\\s*BS\\s+bin11\\s*\\(\\s*EIN\\s*\\)\\s*=\\s*\\d+", Qt::CaseInsensitive);
- QRegExp bin9_rx("^\\s*BS\\s+bin9\\s*\\(\\s*EIN\\s*\\)\\s*=\\s*\\d+", Qt::CaseInsensitive);
- @@ -1084,7 +1084,7 @@ void VKRCToolBox::enumerateSchaltpunkt() {
- block = block.next();
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- viewer->getEditor()->document()->blockSignals(false);
- viewer->getEditor()->document()->modificationChanged(true);
- @@ -1117,7 +1117,7 @@ void VKRCToolBox::addSchaltpunktComment() {
- VKRCSimpleViewer *viewer = (VKRCSimpleViewer *) editor->getEditor()->getViewer();
- if (!viewer) return;
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp bin11_rx("^\\s*BS\\s+bin11\\s*\\(\\s*EIN\\s*\\)\\s*=\\s*\\d+", Qt::CaseInsensitive);
- QRegExp bin9_rx("^\\s*BS\\s+bin9\\s*\\(\\s*EIN\\s*\\)\\s*=\\s*\\d+", Qt::CaseInsensitive);
- @@ -1159,7 +1159,7 @@ void VKRCToolBox::addSchaltpunktComment() {
- block = block.next();
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- viewer->getEditor()->document()->blockSignals(false);
- viewer->getEditor()->document()->modificationChanged(true);
- @@ -1257,7 +1257,7 @@ void VKRCToolBox::vkrc2Txt() {
- else
- viewer->exportToTxt(fileName);
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- @@ -2095,7 +2095,7 @@ void VKRCToolBox::sammelmerker() {
- if ( FBvars.isEmpty() ) return;
- // ------------------------------------------------------
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- bool hasChanged;
- bool skipIfExists = false;
- @@ -2237,7 +2237,7 @@ skip:
- if (onlyCurrFile) break;
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- // find given makro and modify / add the merker
- @@ -2257,7 +2257,7 @@ skip:
- // found Makros directory - change to working directory
- if ( !dir.cd( makroDir.first() ) ) {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, _sammelmerker,
- tr("Could not change directory '%1'").arg(
- dir.absolutePath() + QDir::separator() + makroDir.first() ) );
- @@ -2265,7 +2265,7 @@ skip:
- }
- } else {
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- QMessageBox::warning(0, _sammelmerker,
- tr("Could not find directory '%1'").arg(
- dir.absolutePath() + QDir::separator() + "Makros" ) );
- @@ -2333,7 +2333,7 @@ start:
- QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
- if (ret == QMessageBox::Yes) {
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- plain.replace(newM_rx, newM + " = " + lastFBStr);
- makroPlain->setPlainText(plain);
- @@ -2349,7 +2349,7 @@ start:
- }
- // select new M in the makro
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- if ( newM_rx.indexIn(plain) != -1 ) {
- QTextCursor cursor2 = makroPlain->textCursor();
- @@ -2369,8 +2369,8 @@ skip3:
- }
- }
- -skip2:
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- +skip2:;
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
- @@ -2416,7 +2416,7 @@ void VKRCToolBox::comment() {
- blockList << cursor.block();
- - QApplication::setOverrideCursor(Qt::WaitCursor);
- + //QApplication::setOverrideCursor(Qt::WaitCursor);
- QRegExp indent_rx("^\\s*");
- QRegExp commentStart_rx("^\\s*\\-\\-");
- @@ -2491,5 +2491,5 @@ void VKRCToolBox::comment() {
- }
- }
- - QApplication::setOverrideCursor(Qt::ArrowCursor);
- + //QApplication::setOverrideCursor(Qt::ArrowCursor);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement