From 54e1f05084c52ce32a534735989cf2f4bc7128a5 Mon Sep 17 00:00:00 2001 From: vsv Date: Thu, 17 Apr 2014 16:41:33 +0400 Subject: [PATCH] Remove SLOT/SIGNAL warnings --- eclipse.sh | 4 ++-- linux_env.sh | 2 +- linux_run.sh | 2 +- src/PyConsole/PyConsole_Console.cxx | 8 ++++---- src/XGUI/XGUI_Viewer.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) mode change 100644 => 100755 eclipse.sh mode change 100644 => 100755 linux_run.sh diff --git a/eclipse.sh b/eclipse.sh old mode 100644 new mode 100755 index 76b880add..de64257e3 --- a/eclipse.sh +++ b/eclipse.sh @@ -10,11 +10,11 @@ mkdir -p ${ROOT_DIR}/build cd ${ROOT_DIR}/build CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3" -CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release" +CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install" CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}" cmake -G "Eclipse CDT4 - Unix Makefiles" ${CMAKE_ARGS} -/misc/dn21/hdfeditor/sbh/devtools/eclipse-4.3.0/eclipse& \ No newline at end of file +/misc/dn48/newgeom/common/eclipse-4.3.0/eclipse -Dosgi.locking=none & \ No newline at end of file diff --git a/linux_env.sh b/linux_env.sh index 8bd77be37..37ae41508 100644 --- a/linux_env.sh +++ b/linux_env.sh @@ -3,7 +3,7 @@ # Find absolute path to ROOT_DIR export ROOT_DIR=$(pwd)/.. export ROOT_DIR=`cd "${ROOT_DIR}";pwd` -export PDIR=${ROOT_DIR}/products +export PDIR=/dn48/newgeom/common/products #------ Python ------ export PYTHON_ROOT_DIR=${PDIR}/Python-2.7.3 diff --git a/linux_run.sh b/linux_run.sh old mode 100644 new mode 100755 index 5104f9f9b..7e06fb1b0 --- a/linux_run.sh +++ b/linux_run.sh @@ -7,4 +7,4 @@ SRC_DIR=${ROOT_DIR}/sources source ${SRC_DIR}/linux_env.sh -${ROOT_DIR}/install/bin/XGUI +${ROOT_DIR}/install/bin/GeomApp diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx index 04e244ed0..54391474f 100644 --- a/src/PyConsole/PyConsole_Console.cxx +++ b/src/PyConsole/PyConsole_Console.cxx @@ -290,10 +290,10 @@ void PyConsole_Console::createActions() connect( a, SIGNAL( triggered( bool ) ), myEditor, SLOT( selectAll() ) ); myActions.insert( SelectAllId, a ); - a = new QAction( tr( "EDIT_DUMPCOMMANDS_CMD" ), this ); - a->setStatusTip( tr( "EDIT_DUMPCOMMANDS_CMD" ) ); - connect( a, SIGNAL( triggered( bool ) ), myEditor, SLOT( dump() ) ); - myActions.insert( DumpCommandsId, a ); +// a = new QAction( tr( "EDIT_DUMPCOMMANDS_CMD" ), this ); +// a->setStatusTip( tr( "EDIT_DUMPCOMMANDS_CMD" ) ); +// connect( a, SIGNAL( triggered( bool ) ), myEditor, SLOT( dump() ) ); +// myActions.insert( DumpCommandsId, a ); } /*! diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp index dc5faa611..6d207e991 100644 --- a/src/XGUI/XGUI_Viewer.cpp +++ b/src/XGUI/XGUI_Viewer.cpp @@ -388,7 +388,7 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView) this, SIGNAL(tryCloseView(XGUI_ViewWindow*))); connect(aWindow, SIGNAL(mousePressed(XGUI_ViewWindow*, QMouseEvent*)), - this, SLOT(onMousePressed(XGUI_ViewWindow*, QMouseEvent*))); + this, SIGNAL(mousePress(XGUI_ViewWindow*, QMouseEvent*))); connect(aWindow, SIGNAL(mouseReleased(XGUI_ViewWindow*, QMouseEvent*)), this, SIGNAL(mouseRelease(XGUI_ViewWindow*, QMouseEvent*))); @@ -405,8 +405,8 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView) connect(aWindow, SIGNAL(keyReleased(XGUI_ViewWindow*, QKeyEvent*)), this, SIGNAL(keyRelease(XGUI_ViewWindow*, QKeyEvent*))); - connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )), - this, SLOT (onContextMenuRequested( QContextMenuEvent* ))); +// connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )), +// this, SLOT (onContextMenuRequested( QContextMenuEvent* ))); myViews.append(theView); } -- 2.30.2