Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'next-rebranding' into master-merge

  • Loading branch information...
commit 396b954b3306a09e6bc5dad57a9bbe627e791685 2 parents 654fb49 + dfcebc0
Jason Scott authored
Showing with 201 additions and 201 deletions.
  1. +8 −8 CMakeLists.txt
  2. +3 −3 MacBundle.sh
  3. +2 −2 README.md
  4. +70 −0 Ripple/CMakeLists.txt
  5. 0  Starbuck/Starbuck.icns → Ripple/Ripple.icns
  6. 0  Starbuck/Starbuck.ico → Ripple/Ripple.ico
  7. +2 −0  Ripple/Ripple.rc
  8. +5 −5 {Starbuck → Ripple}/generateQtSource.xml
  9. +3 −3 {Starbuck → Ripple}/main.cpp
  10. +10 −10 Starbuck/starbuck.cpp → Ripple/ripple.cpp
  11. +8 −8 Starbuck/starbuck.h → Ripple/ripple.h
  12. +5 −5 Starbuck/starbuck.pro → Ripple/ripple.pro
  13. 0  Starbuck/starbuck.qrc → Ripple/ripple.qrc
  14. 0  {StarbuckLibrary → Ripple}/stdafx.cpp
  15. 0  {Starbuck → Ripple}/stdafx.h
  16. 0  {StarbuckLibrary → RippleLibrary}/BuildServerManager.cpp
  17. 0  {StarbuckLibrary → RippleLibrary}/BuildServerManager.h
  18. +52 −0 RippleLibrary/CMakeLists.txt
  19. 0  {StarbuckLibrary → RippleLibrary}/ConfigData.cpp
  20. 0  {StarbuckLibrary → RippleLibrary}/ConfigData.h
  21. 0  {StarbuckLibrary → RippleLibrary}/PortScanner.cpp
  22. 0  {StarbuckLibrary → RippleLibrary}/PortScanner.h
  23. +3 −3 {StarbuckLibrary → RippleLibrary}/QtStageWebView.cpp
  24. +2 −2 {StarbuckLibrary → RippleLibrary}/QtStageWebView.h
  25. 0  {StarbuckLibrary → RippleLibrary}/RemoteDebugger.cpp
  26. 0  {StarbuckLibrary → RippleLibrary}/RemoteDebugger.h
  27. +1 −1  {StarbuckLibrary → RippleLibrary}/RequestObject.cpp
  28. +1 −1  {StarbuckLibrary → RippleLibrary}/RequestObject.h
  29. 0  {StarbuckLibrary → RippleLibrary}/ScrollHandler.cpp
  30. +2 −2 {StarbuckLibrary → RippleLibrary}/ScrollHandler.h
  31. +2 −2 {StarbuckLibrary → RippleLibrary}/StageViewMsgHandler.cpp
  32. +6 −6 {StarbuckLibrary → RippleLibrary}/StageViewMsgHandler.h
  33. +1 −1  {StarbuckLibrary → RippleLibrary}/generateQtSource.xml
  34. +2 −2 {StarbuckLibrary → RippleLibrary}/irimstagewebview.h
  35. 0  {Starbuck → RippleLibrary}/stdafx.cpp
  36. 0  {StarbuckLibrary → RippleLibrary}/stdafx.h
  37. +0 −70 Starbuck/CMakeLists.txt
  38. +0 −2  Starbuck/Starbuck.rc
  39. +0 −52 StarbuckLibrary/CMakeLists.txt
  40. +2 −2 TestFramework/CMakeLists.txt
  41. +4 −4 TestFramework/MessageHandlerTest.h
  42. +1 −1  TestFramework/MessageSignalSpy.h
  43. +1 −1  TestFramework/ipctestsuit.cpp
  44. +1 −1  TestFramework/ipctestsuit.h
  45. +1 −1  TestFramework/messagesendthread.h
  46. +1 −1  dist-ci.xml
  47. +1 −1  dist-mac.xml
  48. +1 −1  dist-windows.xml
View
16 CMakeLists.txt
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(Starbuck)
+PROJECT(Ripple)
# -----------------------------------------------------------------------------
@@ -42,13 +42,13 @@ ENDIF ()
# Default target names (can be overrriden in Options${PORT}.cmake file)
# -----------------------------------------------------------------------------
SET(WebKit_LIBRARY_NAME WebKit)
-SET(STARBUCKLIBRARY_LIBRARY_NAME StarbuckLibrary)
+SET(RIPPLELIBRARY_LIBRARY_NAME RippleLibrary)
# -----------------------------------------------------------------------------
# Default library types (can be overrriden in Options${PORT}.cmake file)
# -----------------------------------------------------------------------------
-SET(STARBUCKLIBRARY_LIBRARY_TYPE STATIC)
+SET(RIPPLELIBRARY_LIBRARY_TYPE STATIC)
# -----------------------------------------------------------------------------
# Port-specific options
@@ -63,17 +63,17 @@ SET(CMAKE_SOURCE_DIR ${CMAKE_SRC})
# Add module directories
# -----------------------------------------------------------------------------
#ADD_SUBDIRECTORY(IPC)
-ADD_SUBDIRECTORY(StarbuckLibrary)
-ADD_SUBDIRECTORY(Starbuck)
+ADD_SUBDIRECTORY(RippleLibrary)
+ADD_SUBDIRECTORY(Ripple)
#ADD_SUBDIRECTORY(TestFramework)
-ADD_DEPENDENCIES(Starbuck
- ${STARBUCKLIBRARY_LIBRARY_NAME}
+ADD_DEPENDENCIES(Ripple
+ ${RIPPLELIBRARY_LIBRARY_NAME}
)
#ADD_DEPENDENCIES(TestFramework
-# ${STARBUCKLIBRARY_LIBRARY_NAME}
+# ${RIPPLELIBRARY_LIBRARY_NAME}
# ${IPC_LIBRARY_NAME}
# ${WebKit_LIBRARY_NAME}
#)
View
6 MacBundle.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-echo Cleaning up Starbuck.app
-cd build/bin/Starbuck.app/Contents/MacOS
+echo Cleaning up Ripple.app
+cd build/bin/Ripple.app/Contents/MacOS
echo Moving libpng
cp /Library/Frameworks/libpng.framework/Versions/1.4.5/libpng ../Frameworks/libpng.framework/Versions/1.4.5/
@@ -20,4 +20,4 @@ install_name_tool -change libAmanithVG_SRE.dylib @executable_path/../MacOS/libAm
install_name_tool -change libEGL_AM.dylib @executable_path/../MacOS/libEGL_AM.dylib libEGL_AM.dylib
-echo Done cleaning up Starbuck.app
+echo Done cleaning up Ripple.app
View
4 README.md
@@ -31,7 +31,7 @@ You can also find associated reference material for the Ripple tool as well as c
# Windows (QtWebKit)
* Make sure Qt 4.7.3 is setup on your system and configured properly.
* Use the provided qmake projects to compile.
-* Once compiled add reference to custom QtWebKit in Starbuck project.
+* Once compiled add reference to custom QtWebKit in Ripple project.
# Windows (framework only)
* Create a build directory in your root folder (mkdir build).
@@ -43,7 +43,7 @@ You can also find associated reference material for the Ripple tool as well as c
* Be sure you have all the necessary packages to build: libqt4-dev, libxrender-dev, libsqlite3-dev
* Run qmake in root folder.
* make
-* Copy custom lib.so files into Starbuck folder to be linked.
+* Copy custom lib.so files into Ripple folder to be linked.
# Linux (Ubuntu) (framework only)
* Be sure you have all the necessary packages to build: cmake, libqt4-dev
View
70 Ripple/CMakeLists.txt
@@ -0,0 +1,70 @@
+find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit QtOpenGL REQUIRED)
+include(${QT_USE_FILE})
+
+SET(RIPPLE_INCLUDE_DIRECTORIES
+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_SOURCE_DIR}"
+ "${CMAKE_SOURCE_DIR}/RippleLibrary"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ )
+
+LIST(APPEND RIPPLE_HEADERS
+ stdafx.h
+ )
+
+LIST(APPEND RIPPLE_SOURCES
+ main.cpp
+ ripple.cpp
+ stdafx.cpp
+ )
+
+set(RIPPLE_MOC_HEADERS
+ ripple.h
+ )
+
+QT4_WRAP_CPP(RIPPLE_MOC_SRCS ${RIPPLE_MOC_HEADERS})
+
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_HEADERS} )
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_MOC_HEADERS} )
+LIST(APPEND RIPPLE_SOURCES ${RIPPLE_MOC_SRCS} )
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${RIPPLE_INCLUDE_DIRECTORIES})
+include_directories(${QT_INCLUDE_DIR})
+
+set(RIPPLE_LIBRARIES
+ ${RIPPLELIBRARY_LIBRARY_NAME}
+ )
+
+IF (WTF_OS_MAC_OS_X)
+
+
+SET(MAC_BUNDLE_RESOURCES "Ripple.icns")
+SET_SOURCE_FILES_PROPERTIES(
+ "Ripple.icns"
+ PROPERTIES
+ MACOSX_PACKAGE_LOCATION Resources
+ )
+
+ SET( MACOSX_BUNDLE_ICON_FILE Ripple.icns )
+
+ ADD_EXECUTABLE(Ripple MACOSX_BUNDLE ${RIPPLE_SOURCES} ${MAC_BUNDLE_RESOURCES})
+
+ SET(LIBS ${RIPPLE_LIBRARIES} )
+
+ SET(DIRS ${QT_BINARY_DIR} ${CMAKE_BINARY_DIR}/bin)
+
+ SET(APPS ${CMAKE_BINARY_DIR}/bin/Ripple.app)
+
+ELSEIF (WTF_OS_WINDOWS)
+ ADD_EXECUTABLE(Ripple WIN32 ${RIPPLE_SOURCES} Ripple.rc)
+ELSE ()
+ ADD_EXECUTABLE(Ripple ${RIPPLE_SOURCES})
+ENDIF()
+
+SET_TARGET_PROPERTIES(Ripple PROPERTIES OUTPUT_NAME Ripple)
+
+TARGET_LINK_LIBRARIES(Ripple ${RIPPLE_LIBRARIES} ${QT_LIBRARIES} ${optionalLibs})
+
+INSTALL(TARGETS Ripple DESTINATION ${CMAKE_BINARY_DIR}/bin)
+
View
0  Starbuck/Starbuck.icns → Ripple/Ripple.icns
File renamed without changes
View
0  Starbuck/Starbuck.ico → Ripple/Ripple.ico
File renamed without changes
View
2  Ripple/Ripple.rc
@@ -0,0 +1,2 @@
+IDI_ICON1 ICON DISCARDABLE "Ripple.ico"
+
View
10 Starbuck/generateQtSource.xml → Ripple/generateQtSource.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="Starbuck Qt Source Generation" basedir="." default="generateSources">
+<project name="Ripple Qt Source Generation" basedir="." default="generateSources">
<property name="generatedFiles" value="${basedir}\GeneratedFiles"/>
<property name="searchString" value="Q_OBJECT"/>
@@ -33,11 +33,11 @@
</apply>
<!-- Generate qrc source file for Qt resources -->
- <echo message="Generating qrc_starbuck.cpp..."/>
+ <echo message="Generating qrc_ripple.cpp..."/>
<exec executable="rcc.exe">
- <arg line="-name starbuck"/>
- <arg path="${basedir}\starbuck.qrc"/>
- <arg line="-o ${generatedFiles}\qrc_starbuck.cpp"/>
+ <arg line="-name ripple"/>
+ <arg path="${basedir}\ripple.qrc"/>
+ <arg line="-o ${generatedFiles}\qrc_ripple.cpp"/>
</exec>
</target>
</project>
View
6 Starbuck/main.cpp → Ripple/main.cpp
@@ -15,7 +15,7 @@
*/
#include "stdafx.h"
-#include "starbuck.h"
+#include "ripple.h"
#include <QtGui/QApplication>
#include "RemoteDebugger.h"
#ifdef Q_WS_WIN
@@ -23,7 +23,7 @@
#include <tchar.h>
#endif
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
void write(const char * msg, QString type)
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
}
else
{
- Starbuck *mainWin = new Starbuck;
+ Ripple *mainWin = new Ripple;
mainWin->show();
}
return app.exec();
View
20 Starbuck/starbuck.cpp → Ripple/ripple.cpp
@@ -15,21 +15,21 @@
*/
#include "stdafx.h"
-#include "starbuck.h"
+#include "ripple.h"
#include "BuildServerManager.h"
#include <QGLWidget>
#include "ScrollHandler.h"
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
-const int Starbuck::PROGRESS_BAR_HEIGHT = 23;
+const int Ripple::PROGRESS_BAR_HEIGHT = 23;
-Starbuck::Starbuck(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags)
+Ripple::Ripple(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags)
{
init();
}
-Starbuck::~Starbuck()
+Ripple::~Ripple()
{
if (_config != NULL)
delete _config;
@@ -41,7 +41,7 @@ Starbuck::~Starbuck()
delete webViewInternal;
}
-void Starbuck::init(void)
+void Ripple::init(void)
{
_config = ConfigData::getInstance();
setAttribute(Qt::WA_DeleteOnClose);
@@ -131,7 +131,7 @@ void Starbuck::init(void)
}
-void Starbuck::closeEvent(QCloseEvent *event)
+void Ripple::closeEvent(QCloseEvent *event)
{
_config->windowPosition(pos());
if (this->windowState() != Qt::WindowMaximized)
@@ -142,14 +142,14 @@ void Starbuck::closeEvent(QCloseEvent *event)
BuildServerManager::getInstance()->stop();
}
-void Starbuck::registerAPIs()
+void Ripple::registerAPIs()
{
//register StageWebViewMsgHandler as JS object named stagewebview
QWebFrame* frame = webViewInternal->qtStageWebView()->page()->mainFrame();
frame->addToJavaScriptWindowObject(QString("stagewebview"), m_pStageViewHandler);
}
-void Starbuck::resizeEvent(QResizeEvent * e )
+void Ripple::resizeEvent(QResizeEvent * e )
{
QRect vRect(QPoint(0, 0), size());
webViewInternal->scene()->setSceneRect(vRect);
@@ -158,7 +158,7 @@ void Starbuck::resizeEvent(QResizeEvent * e )
e->accept();
}
-void Starbuck::urlChanged(QUrl &url)
+void Ripple::urlChanged(QUrl &url)
{
}
View
16 Starbuck/starbuck.h → Ripple/ripple.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef STARBUCK_H
-#define STARBUCK_H
+#ifndef RIPPLE_H
+#define RIPPLE_H
#include <QMainWindow>
#include <QWebPage>
@@ -26,19 +26,19 @@
#include "StageViewMsgHandler.h"
#include "QtStageWebView.h"
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
namespace BlackBerry
{
- namespace Starbuck
+ namespace Ripple
{
- class Starbuck : public QMainWindow
+ class Ripple : public QMainWindow
{
Q_OBJECT
public:
- Starbuck(QWidget *parent = 0, Qt::WFlags flags = 0);
- ~Starbuck();
+ Ripple(QWidget *parent = 0, Qt::WFlags flags = 0);
+ ~Ripple();
protected:
void closeEvent(QCloseEvent *event);
@@ -61,4 +61,4 @@ namespace BlackBerry
};
}
}
-#endif // STARBUCK_H
+#endif // RIPPLE_H
View
10 Starbuck/starbuck.pro → Ripple/ripple.pro
@@ -3,7 +3,7 @@
######################################################################
TEMPLATE = app
-TARGET = starbuck
+TARGET = ripple
DEPENDPATH += .
INCLUDEPATH += .
@@ -11,12 +11,12 @@ INCLUDEPATH += .
# in some configuration file
INCLUDEPATH += ../build ../IPC
-LIBS += -L../build -lipc -lstarbucklibrary
+LIBS += -L../build -lipc -lripplelibrary
# Required QT modules
QT += webkit network xml
# Input
-HEADERS += application.h starbuck.h ../StarbuckLibrary/*.h
-SOURCES += application.cpp main.cpp starbuck.cpp
-RESOURCES += starbuck.qrc
+HEADERS += application.h ripple.h ../RippleLibrary/*.h
+SOURCES += application.cpp main.cpp ripple.cpp
+RESOURCES += ripple.qrc
View
0  Starbuck/starbuck.qrc → Ripple/ripple.qrc
File renamed without changes
View
0  StarbuckLibrary/stdafx.cpp → Ripple/stdafx.cpp
File renamed without changes
View
0  Starbuck/stdafx.h → Ripple/stdafx.h
File renamed without changes
View
0  StarbuckLibrary/BuildServerManager.cpp → RippleLibrary/BuildServerManager.cpp
File renamed without changes
View
0  StarbuckLibrary/BuildServerManager.h → RippleLibrary/BuildServerManager.h
File renamed without changes
View
52 RippleLibrary/CMakeLists.txt
@@ -0,0 +1,52 @@
+find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit REQUIRED)
+include(${QT_USE_FILE})
+
+SET(RIPPLELIBRARY_INCLUDE_DIRECTORIES
+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+LIST(APPEND RIPPLELIBRARY_HEADERS
+ stdafx.h
+ ConfigData.h
+ PortScanner.h
+ RemoteDebugger.h
+)
+
+LIST(APPEND RIPPLELIBRARY_SOURCES
+ stdafx.cpp
+ ConfigData.cpp
+ QtStageWebView.cpp
+ StageViewMsgHandler.cpp
+ stdafx.cpp
+ RequestObject.cpp
+ BuildServerManager.cpp
+ PortScanner.cpp
+ ScrollHandler.cpp
+ RemoteDebugger.cpp
+)
+
+SET(RIPPLELIBRARY_MOC_HEADERS
+ QtStageWebView.h
+ StageViewMsgHandler.h
+ RequestObject.h
+ BuildServerManager.h
+ ScrollHandler.h
+ RemoteDebugger.h
+)
+
+QT4_WRAP_CPP(RIPPLELIBRARY_MOC_SRCS ${RIPPLELIBRARY_MOC_HEADERS})
+
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_HEADERS})
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_MOC_HEADERS})
+LIST(APPEND RIPPLELIBRARY_SOURCES ${RIPPLELIBRARY_MOC_SRCS})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${RIPPLELIBRARY_INCLUDE_DIRECTORIES})
+include_directories(${QT_INCLUDE_DIR})
+
+ADD_LIBRARY(RippleLibrary ${RIPPLELIBRARY_SOURCES})
+TARGET_LINK_LIBRARIES(RippleLibrary ${QT_LIBRARIES} ${optionalLibs})
+
+INSTALL(TARGETS RippleLibrary DESTINATION ${CMAKE_BINARY_DIR}/bin)
+
View
0  StarbuckLibrary/ConfigData.cpp → RippleLibrary/ConfigData.cpp
File renamed without changes
View
0  StarbuckLibrary/ConfigData.h → RippleLibrary/ConfigData.h
File renamed without changes
View
0  StarbuckLibrary/PortScanner.cpp → RippleLibrary/PortScanner.cpp
File renamed without changes
View
0  StarbuckLibrary/PortScanner.h → RippleLibrary/PortScanner.h
File renamed without changes
View
6 StarbuckLibrary/QtStageWebView.cpp → RippleLibrary/QtStageWebView.cpp
@@ -23,7 +23,7 @@
#include "RemoteDebugger.h"
#include "PortScanner.h"
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
QtStageWebView::QtStageWebView(QWidget *p) : waitForJsLoad(false),_headersSize(0), m_inspector(0), m_inspectorProcess(0)
{
@@ -115,13 +115,13 @@ void QtStageWebView::registerEventbus()
{
QWebFrame* frame = page()->mainFrame();
frame->addToJavaScriptWindowObject(QString("eventbus2"), new BlackBerryBus(this, frame));
- frame->evaluateJavaScript(BlackBerry::Starbuck::eventbusSource);
+ frame->evaluateJavaScript(BlackBerry::Ripple::eventbusSource);
// check for iframes, if found add to window object
for(int i = 0; i < frame->childFrames().length(); i++)
{
frame->childFrames()[i]->addToJavaScriptWindowObject(QString("eventbus2"), new BlackBerryBus(this, frame->childFrames()[i]));
- frame->childFrames()[i]->evaluateJavaScript(BlackBerry::Starbuck::eventbusSource);
+ frame->childFrames()[i]->evaluateJavaScript(BlackBerry::Ripple::eventbusSource);
}
}
#endif
View
4 StarbuckLibrary/QtStageWebView.h → RippleLibrary/QtStageWebView.h
@@ -39,9 +39,9 @@
class ScrollHandler;
class RemoteDebugger;
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
-class QtStageWebView : public QGraphicsWebView, public IStarbuckWebView
+class QtStageWebView : public QGraphicsWebView, public IRippleWebView
{
Q_OBJECT
ScrollHandler *m_pScrollHandler;
View
0  StarbuckLibrary/RemoteDebugger.cpp → RippleLibrary/RemoteDebugger.cpp
File renamed without changes
View
0  StarbuckLibrary/RemoteDebugger.h → RippleLibrary/RemoteDebugger.h
File renamed without changes
View
2  StarbuckLibrary/RequestObject.cpp → RippleLibrary/RequestObject.cpp
@@ -17,7 +17,7 @@
#include "stdafx.h"
#include "RequestObject.h"
-using namespace BlackBerry::Starbuck;
+using namespace BlackBerry::Ripple;
RequestObject::RequestObject(QString& url, QObject *parent, QWebFrame* frame) : QObject(parent), m_url(url), m_pWebFrame(frame)
{
View
2  StarbuckLibrary/RequestObject.h → RippleLibrary/RequestObject.h
@@ -22,7 +22,7 @@
#include <QWebPage>
namespace BlackBerry {
-namespace Starbuck {
+namespace Ripple {
class RequestObject : public QObject
{
View
0  StarbuckLibrary/ScrollHandler.cpp → RippleLibrary/ScrollHandler.cpp
File renamed without changes
View
4 StarbuckLibrary/ScrollHandler.h → RippleLibrary/ScrollHandler.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef Starbuck_ScrollHandler_h
-#define Starbuck_ScrollHandler_h
+#ifndef Ripple_ScrollHandler_h
+#define Ripple_ScrollHandler_h
#include <QObject>
#include <QTimer>
View
4 StarbuckLibrary/StageViewMsgHandler.cpp → RippleLibrary/StageViewMsgHandler.cpp
@@ -17,8 +17,8 @@
#include "stdafx.h"
#include "StageViewMsgHandler.h"
-using namespace BlackBerry::Starbuck;
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple;
+using namespace BlackBerry::Ripple::IPCChannel;
StageViewMsgHandler::StageViewMsgHandler(QObject *parent)
: QObject(parent),m_pWebView(0), _buildServerPort(0)
View
12 StarbuckLibrary/StageViewMsgHandler.h → RippleLibrary/StageViewMsgHandler.h
@@ -18,10 +18,10 @@
#define STAGEVIEWMSGHANDLER_H
#include "QtStageWebView.h"
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
namespace BlackBerry {
-namespace Starbuck {
+namespace Ripple {
class StageViewMsgHandler : public QObject
{
@@ -32,7 +32,7 @@ class StageViewMsgHandler : public QObject
StageViewMsgHandler(QObject *parent = 0);
~StageViewMsgHandler();
- void Register(IStarbuckWebView* pWebView)
+ void Register(IRippleWebView* pWebView)
{
m_pWebView = pWebView;
registerEvents();
@@ -76,9 +76,9 @@ private slots:
void registerEvents();
private:
- virtual IStarbuckWebView* stageWebview()
+ virtual IRippleWebView* stageWebview()
{
- return dynamic_cast<IStarbuckWebView*>(m_pWebView);
+ return dynamic_cast<IRippleWebView*>(m_pWebView);
}
virtual QtStageWebView* rimStageWebview()
@@ -92,7 +92,7 @@ private slots:
}
private:
- IStarbuckWebView* m_pWebView;
+ IRippleWebView* m_pWebView;
int _buildServerPort;
};
}}
View
2  StarbuckLibrary/generateQtSource.xml → RippleLibrary/generateQtSource.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="Starbuck Library Qt Source Generation" basedir="." default="generateSources">
+<project name="Ripple Library Qt Source Generation" basedir="." default="generateSources">
<property name="generatedFiles" value="${basedir}\GeneratedFiles"/>
<property name="searchString" value="Q_OBJECT"/>
View
4 StarbuckLibrary/irimstagewebview.h → RippleLibrary/irimstagewebview.h
@@ -17,9 +17,9 @@
#pragma once
namespace BlackBerry {
-namespace Starbuck {
+namespace Ripple {
namespace IPCChannel {
-class IStarbuckWebView
+class IRippleWebView
{
public:
virtual void loadURL(QString url) = 0;
View
0  Starbuck/stdafx.cpp → RippleLibrary/stdafx.cpp
File renamed without changes
View
0  StarbuckLibrary/stdafx.h → RippleLibrary/stdafx.h
File renamed without changes
View
70 Starbuck/CMakeLists.txt
@@ -1,70 +0,0 @@
-find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit QtOpenGL REQUIRED)
-include(${QT_USE_FILE})
-
-SET(STARBUCK_INCLUDE_DIRECTORIES
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_SOURCE_DIR}"
- "${CMAKE_SOURCE_DIR}/StarbuckLibrary"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- )
-
-LIST(APPEND STARBUCK_HEADERS
- stdafx.h
- )
-
-LIST(APPEND STARBUCK_SOURCES
- main.cpp
- starbuck.cpp
- stdafx.cpp
- )
-
-set(STARBUCK_MOC_HEADERS
- starbuck.h
- )
-
-QT4_WRAP_CPP(STARBUCK_MOC_SRCS ${STARBUCK_MOC_HEADERS})
-
-LIST(APPEND STARBUCK_SOURCES ${STARBUCK_HEADERS} )
-LIST(APPEND STARBUCK_SOURCES ${STARBUCK_MOC_HEADERS} )
-LIST(APPEND STARBUCK_SOURCES ${STARBUCK_MOC_SRCS} )
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${STARBUCK_INCLUDE_DIRECTORIES})
-include_directories(${QT_INCLUDE_DIR})
-
-set(STARBUCK_LIBRARIES
- ${STARBUCKLIBRARY_LIBRARY_NAME}
- )
-
-IF (WTF_OS_MAC_OS_X)
-
-
-SET(MAC_BUNDLE_RESOURCES "Starbuck.icns")
-SET_SOURCE_FILES_PROPERTIES(
- "Starbuck.icns"
- PROPERTIES
- MACOSX_PACKAGE_LOCATION Resources
- )
-
- SET( MACOSX_BUNDLE_ICON_FILE Starbuck.icns )
-
- ADD_EXECUTABLE(Starbuck MACOSX_BUNDLE ${STARBUCK_SOURCES} ${MAC_BUNDLE_RESOURCES})
-
- SET(LIBS ${STARBUCK_LIBRARIES} )
-
- SET(DIRS ${QT_BINARY_DIR} ${CMAKE_BINARY_DIR}/bin)
-
- SET(APPS ${CMAKE_BINARY_DIR}/bin/Ripple.app)
-
-ELSEIF (WTF_OS_WINDOWS)
- ADD_EXECUTABLE(Starbuck WIN32 ${STARBUCK_SOURCES} Starbuck.rc)
-ELSE ()
- ADD_EXECUTABLE(Starbuck ${STARBUCK_SOURCES})
-ENDIF()
-
-SET_TARGET_PROPERTIES(Starbuck PROPERTIES OUTPUT_NAME Ripple)
-
-TARGET_LINK_LIBRARIES(Starbuck ${STARBUCK_LIBRARIES} ${QT_LIBRARIES} ${optionalLibs})
-
-INSTALL(TARGETS Starbuck DESTINATION ${CMAKE_BINARY_DIR}/bin)
-
View
2  Starbuck/Starbuck.rc
@@ -1,2 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "Starbuck.ico"
-
View
52 StarbuckLibrary/CMakeLists.txt
@@ -1,52 +0,0 @@
-find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSql QtNetwork QtWebKit REQUIRED)
-include(${QT_USE_FILE})
-
-SET(STARBUCKLIBRARY_INCLUDE_DIRECTORIES
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
-LIST(APPEND STARBUCKLIBRARY_HEADERS
- stdafx.h
- ConfigData.h
- PortScanner.h
- RemoteDebugger.h
-)
-
-LIST(APPEND STARBUCKLIBRARY_SOURCES
- stdafx.cpp
- ConfigData.cpp
- QtStageWebView.cpp
- StageViewMsgHandler.cpp
- stdafx.cpp
- RequestObject.cpp
- BuildServerManager.cpp
- PortScanner.cpp
- ScrollHandler.cpp
- RemoteDebugger.cpp
-)
-
-SET(STARBUCKLIBRARY_MOC_HEADERS
- QtStageWebView.h
- StageViewMsgHandler.h
- RequestObject.h
- BuildServerManager.h
- ScrollHandler.h
- RemoteDebugger.h
-)
-
-QT4_WRAP_CPP(STARBUCKLIBRARY_MOC_SRCS ${STARBUCKLIBRARY_MOC_HEADERS})
-
-LIST(APPEND STARBUCKLIBRARY_SOURCES ${STARBUCKLIBRARY_HEADERS})
-LIST(APPEND STARBUCKLIBRARY_SOURCES ${STARBUCKLIBRARY_MOC_HEADERS})
-LIST(APPEND STARBUCKLIBRARY_SOURCES ${STARBUCKLIBRARY_MOC_SRCS})
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${STARBUCKLIBRARY_INCLUDE_DIRECTORIES})
-include_directories(${QT_INCLUDE_DIR})
-
-ADD_LIBRARY(StarbuckLibrary ${STARBUCKLIBRARY_SOURCES})
-TARGET_LINK_LIBRARIES(StarbuckLibrary ${QT_LIBRARIES} ${optionalLibs})
-
-INSTALL(TARGETS StarbuckLibrary DESTINATION ${CMAKE_BINARY_DIR}/bin)
-
View
4 TestFramework/CMakeLists.txt
@@ -4,7 +4,7 @@ include(${QT_USE_FILE})
SET(TESTFRAMEWORK_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
"${CMAKE_SOURCE_DIR}"
- "${CMAKE_SOURCE_DIR}/StarbuckLibrary"
+ "${CMAKE_SOURCE_DIR}/RippleLibrary"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/gmock-1.6.0"
"${CMAKE_CURRENT_SOURCE_DIR}/gmock-1.6.0/include"
@@ -41,7 +41,7 @@ include_directories(${TESTFRAMEWORK_INCLUDE_DIRECTORIES})
include_directories(${QT_INCLUDE_DIR})
set(TESTFRAMEWORK_LIBRARIES
- ${STARBUCKLIBRARY_LIBRARY_NAME}
+ ${RIPPLELIBRARY_LIBRARY_NAME}
)
ADD_EXECUTABLE(TestFramework ${TESTFRAMEWORK_SOURCES})
View
8 TestFramework/MessageHandlerTest.h
@@ -24,12 +24,12 @@
using ::testing::Return;
using ::testing::Invoke;
-using namespace BlackBerry::Starbuck;
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple;
+using namespace BlackBerry::Ripple::IPCChannel;
//Q_DECLARE_METATYPE(Message *);
-class MockRIMStageWebView : public IStarbuckWebView
+class MockRIMStageWebView : public IRippleWebView
{
public:
MockRIMStageWebView() {}
@@ -57,5 +57,5 @@ class TestStageViewMsgHandler : public StageViewMsgHandler
TestStageViewMsgHandler() {}
virtual ~TestStageViewMsgHandler() {}
- MOCK_METHOD0(stageWebview, IStarbuckWebView*());
+ MOCK_METHOD0(stageWebview, IRippleWebView*());
};
View
2  TestFramework/MessageSignalSpy.h
@@ -20,7 +20,7 @@
#include "message.h"
#include <QSignalSpy>
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
class MessageSignalSpy : public QObject
{
View
2  TestFramework/ipctestsuit.cpp
@@ -31,7 +31,7 @@ IPCTestSuit::~IPCTestSuit()
void IPCTestSuit::initTestCase()
{
qDebug("create a IPCBridge instance");
- QString ssm = QString("StarbuckSM");
+ QString ssm = QString("RippleSM");
m_bridge = new IPCBridge(ssm,this); //one way communication
m_pHandler = new SampleMessagehandler(this);
m_bridge->RegisterMessageHandler(m_pHandler);
View
2  TestFramework/ipctestsuit.h
@@ -23,7 +23,7 @@
#include <QThread>
#include "ipcbridge.h"
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
class IPCTestSuit : public QObject
{
View
2  TestFramework/messagesendthread.h
@@ -20,7 +20,7 @@
#include <QThread>
#include "samplemessagehandler.h"
-using namespace BlackBerry::Starbuck::IPCChannel;
+using namespace BlackBerry::Ripple::IPCChannel;
class MessageSendThread : public QThread
{
View
2  dist-ci.xml
@@ -1,7 +1,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>Starbuck</id>
+ <id>Ripple</id>
<formats>
<format>zip</format>
</formats>
View
2  dist-mac.xml
@@ -1,7 +1,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>Starbuck</id>
+ <id>Ripple</id>
<formats>
<format>zip</format>
</formats>
View
2  dist-windows.xml
@@ -1,7 +1,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>Starbuck</id>
+ <id>Ripple</id>
<formats>
<format>zip</format>
</formats>
Please sign in to comment.
Something went wrong with that request. Please try again.