~ubuntu-branches/ubuntu/quantal/openmsx-debugger/quantal

« back to all changes in this revision

Viewing changes to src/Convert.cpp

Committer: Bazaar Package Importer
Author(s): Joost Yervante Damad
Date: 2009-12-06 07:40:02 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20091206074002-kssfkg1d6xbp6w9e

Tags: 0.0.0.svn20091206-1

http://bugs.debian.org/559612

New svn snapshot (Closes: #559612)

files added:
build/detectsys.py

build/makeutils.py

build/msvc

build/msvc/genconfig.py

build/msvc/openmsx-debugger.sln

build/msvc/openmsx-debugger.vcproj

build/msvc/openmsx-debugger.vsprops

build/outpututils.py

build/package-windows

build/package-windows/package.cmd

build/package-windows/packagewindows.py

build/package-windows/packagezip.py

build/version.py

build/version2code.py

build/win_resource.py

resources/openmsx-debugger.rc

src/BitMapViewer.cpp

src/BitMapViewer.h

src/BitMapViewer.ui

src/CPURegs.cpp

src/CPURegs.h

src/DebugSession.cpp

src/DebugSession.h

src/InteractiveButton.cpp

src/InteractiveButton.h

src/InteractiveLabel.cpp

src/InteractiveLabel.h

src/MainMemoryViewer.cpp

src/MainMemoryViewer.h

src/SimpleHexRequest.cpp

src/SimpleHexRequest.h

src/VDPCommandRegViewer.cpp

src/VDPCommandRegViewer.h

src/VDPCommandRegisters.ui

src/VDPDataStore.cpp

src/VDPDataStore.h

src/VDPRegViewer.cpp

src/VDPRegViewer.h

src/VDPRegistersExplained.ui

src/VDPStatusRegViewer.cpp

src/VDPStatusRegViewer.h

src/VDPStatusRegisters.ui

src/VramBitMappedView.cpp

src/VramBitMappedView.h

src/openmsx

src/openmsx/MSXException.h

src/openmsx/QAbstractSocketStreamWrapper.cpp

src/openmsx/QAbstractSocketStreamWrapper.h

src/openmsx/SspiNegotiateClient.cpp

src/openmsx/SspiNegotiateClient.h

src/openmsx/SspiUtils.cpp

src/openmsx/SspiUtils.h

src/openmsx/node.mk

src/openmsx/openmsx.h

files removed:
build/config.guess

build/detectsys.sh

files modified:
ChangeLog

build/main.mk

build/node-end.mk

build/node-start.mk

build/node.mk

debian/changelog

debian/control

debian/rules

resources/node.mk

src/BreakpointDialog.cpp

src/BreakpointDialog.h

src/CPURegsViewer.cpp

src/CPURegsViewer.h

src/CommClient.cpp

src/ConnectDialog.cpp

src/ConnectDialog.h

src/Convert.cpp

src/Convert.h

src/Dasm.cpp

src/Dasm.h

src/DasmTables.cpp

src/DasmTables.h

src/DebuggableViewer.cpp

src/DebuggableViewer.h

src/DebuggerData.cpp

src/DebuggerData.h

src/DebuggerForm.cpp

src/DebuggerForm.h

src/DisasmViewer.cpp

src/DisasmViewer.h

src/DockManager.cpp

src/DockManager.h

src/DockableWidget.cpp

src/DockableWidget.h

src/DockableWidgetArea.cpp

src/DockableWidgetArea.h

src/DockableWidgetLayout.cpp

src/DockableWidgetLayout.h

src/FlagsViewer.cpp

src/FlagsViewer.h

src/HexViewer.cpp

src/HexViewer.h

src/OpenMSXConnection.cpp

src/OpenMSXConnection.h

src/PreferencesDialog.cpp

src/PreferencesDialog.h

src/Settings.cpp

src/Settings.h

src/SlotViewer.cpp

src/SlotViewer.h

src/StackViewer.cpp

src/StackViewer.h

src/SymbolManager.cpp

src/SymbolManager.h

src/SymbolManager.ui

src/SymbolTable.cpp

src/SymbolTable.h

src/Version.cpp

src/main.cpp

src/node.mk

Show diffs side-by-side

added added

removed removed

src/Convert.cpp

#include "Convert.h"

#include <QString>

int stringToValue( const QString& str )

int stringToValue(const QString& str)

{

QString s = str.trimmed();

int base = 10;

// find base prefix or postfix

if( s.startsWith("&" ) ) {

switch( s[1].toUpper().toAscii() ) {

case 'H':

base = 16;

break;

case 'B':

base = 2;

break;

case 'O':

base = 8;

break;

// find base (prefix or postfix)

if (s.startsWith("&") && s.size() >= 2) {

switch (s[1].toUpper().toAscii()) {

case 'H':

base = 16;

break;

case 'B':

base = 2;

break;

case 'O':

base = 8;

break;

}

s = s.remove(0, 2);

} else if( s.startsWith("#") || s.startsWith("$") ) {

} else if (s.startsWith("#") || s.startsWith("$")) {

base = 16;

s = s.remove(0, 1);

} else if( s.startsWith("0x") ) {

} else if (s.startsWith("0x")) {

base = 16;

s = s.remove(0, 2);

} else if( s.startsWith("%") ) {

} else if (s.startsWith("%")) {

base = 2;

s = s.remove(0, 1);

} else {

switch( s.right(1)[0].toUpper().toAscii() ) {

} else if (!s.isEmpty()) {

switch (s.right(1)[0].toUpper().toAscii()) {

case 'H':

case '#':

base = 16;

base = 8;

break;

}

if( base != 10 ) s.chop(1);

if (base != 10) s.chop(1);

}

// convert value

bool ok;

int value = s.toInt( &ok, base );

if( ok )

return value;

else

return -1;

int value = s.toInt(&ok, base);

if (!ok) return -1;

return value;

}

Older »