[Piklab-svn] SF.net SVN: piklab:[2866] trunk/piklab_kde4
IDE for PIC microcontrollers
Brought to you by:
azhyd
|
From: <az...@us...> - 2012-04-07 19:38:12
|
Revision: 2866
http://piklab.svn.sourceforge.net/piklab/?rev=2866&view=rev
Author: azhyd
Date: 2012-04-07 19:38:04 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
fix compilation warnings
Modified Paths:
--------------
trunk/piklab_kde4/piklab.kdev4
trunk/piklab_kde4/src/devices/gui/hex_view.cpp
trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
trunk/piklab_kde4/src/devices/gui/register_view.cpp
trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp
trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp
trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h
trunk/piklab_kde4/src/libgui/device_editor.h
trunk/piklab_kde4/src/libgui/device_gui.cpp
trunk/piklab_kde4/src/libgui/editor_manager.cpp
trunk/piklab_kde4/src/libgui/hex_editor.h
trunk/piklab_kde4/src/libgui/project_manager.cpp
trunk/piklab_kde4/src/libgui/watch_view.cpp
trunk/piklab_kde4/src/piklab-hex/main.cpp
trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp
trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp
trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp
trunk/piklab_kde4/src/progs/gui/port_selector.cpp
trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp
trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp
trunk/piklab_kde4/src/tools/boost/boost.cpp
trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp
trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
trunk/piklab_kde4/src/tools/jal/jal.cpp
trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
trunk/piklab_kde4/src/tools/list/compile_config.cpp
trunk/piklab_kde4/src/tools/list/compile_manager.cpp
trunk/piklab_kde4/src/tools/list/compile_process.cpp
trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
trunk/piklab_kde4/src/tools/picc/picc.cpp
Modified: trunk/piklab_kde4/piklab.kdev4
===================================================================
--- trunk/piklab_kde4/piklab.kdev4 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/piklab.kdev4 2012-04-07 19:38:04 UTC (rev 2866)
@@ -1,3 +1,3 @@
[Project]
Manager=KDevCMakeManager
-Name=piklab
+Name=piklab_kde4
Modified: trunk/piklab_kde4/src/devices/gui/hex_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/hex_view.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/hex_view.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -17,7 +17,7 @@
void Device::HexView::display(Memory *memory)
{
_memory = memory;
- for (uint i=0; i<_editors.count(); i++) delete _editors[i];
+ for (int i=0; i<_editors.count(); i++) delete _editors[i];
_editors.clear();
if ( _memory==0 ) return;
internalDisplay();
Modified: trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/memory_editor.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/memory_editor.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -116,7 +116,7 @@
void Device::MemoryRangeEditor::setReadOnly(bool readOnly)
{
- for (uint i=0; i<_editors.count(); i++)
+ for (int i=0; i<_editors.count(); i++)
_editors[i]->setReadOnly(readOnly || isRangeReadOnly());
}
@@ -144,7 +144,7 @@
_scrollbar->blockSignals(false);
// memory
- for (uint i=0; i<_editors.count(); i++) {
+ for (int i=0; i<_editors.count(); i++) {
int offset = wordOffset() + i;
_editors[i]->setOffset(offset<int(nbWords()) ? offset : -1);
}
@@ -152,7 +152,7 @@
// adresses
uint inc = addressIncrement();
Address address = startAddress() + inc * wordOffset();
- for (uint i=0; i<_addresses.count(); i++) {
+ for (int i=0; i<_addresses.count(); i++) {
_addresses[i]->setText(toHex(address, 2*_memory->device().nbBytesAddress()));
updateAddressColor(i, address);
address += inc * _nbCols;
@@ -254,13 +254,13 @@
void Device::MemoryEditorGroup::setReadOnly(bool readOnly)
{
- for (uint i=0; i<_editors.count(); i++)
+ for (int i=0; i<_editors.count(); i++)
_editors[i]->setReadOnly(readOnly);
}
void Device::MemoryEditorGroup::updateDisplay()
{
- for (uint i=0; i<_editors.count(); i++)
+ for (int i=0; i<_editors.count(); i++)
_editors[i]->updateDisplay();
}
Modified: trunk/piklab_kde4/src/devices/gui/register_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/register_view.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/register_view.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -116,7 +116,7 @@
setText(1, label());
setText(2, textValue());
repaint();
- for (uint i=0; i<_items.count(); i++) _items[i]->updateView();
+ for (int i=0; i<_items.count(); i++) _items[i]->updateView();
}
void Register::ListViewItem::setBase(NumberBase base)
Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -38,7 +38,7 @@
const Pic::RegistersData &rdata = data.registersData();
ListContainer *branch = container->appendBranch(i18n("SFRs"));
QValueVector<Pic::RegisterNameData> list = Pic::sfrList(data);
- for (uint i=0; i<list.count(); i++) {
+ for (int i=0; i<list.count(); i++) {
branch->appendItem(list[i].label(), ids.count(), ListContainer::UnChecked);
ids.append(list[i].data());
}
@@ -69,7 +69,7 @@
if ( list.count()==0 ) {
branch->appendItem(i18n("No variable"), ids.count(), ListContainer::Disabled);
ids.append(Register::TypeData());
- } else for (uint i=0; i<list.count(); i++) {
+ } else for (int i=0; i<list.count(); i++) {
branch->appendItem(list[i].label(), ids.count(), ListContainer::UnChecked);
ids.append(list[i].data());
}
Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -41,7 +41,7 @@
bool Pic::MemoryEditorLegend::Data::hasAction(const KAction *action) const
{
- for (uint i=0; i<actions.count(); i++) if ( actions[i]==action ) return true;
+ for (int i=0; i<actions.count(); i++) if ( actions[i]==action ) return true;
return false;
}
@@ -102,7 +102,7 @@
_boot.button->setEnabled(!r.isEmpty());
_boot.setProtected(memory().isBootProtected(ptype));
}
- for (uint i=0; i<_blocks.count(); i++) {
+ for (int i=0; i<_blocks.count(); i++) {
AddressRange r = memory().blockRange(i);
if ( r.isEmpty() ) _blocks[i].label->setText(i18n("not present"));
else _blocks[i].label->setText(QString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
@@ -120,7 +120,7 @@
emit setStartWord(r.start - start);
return;
}
- for (uint i=0; i<_blocks.count(); i++) {
+ for (int i=0; i<_blocks.count(); i++) {
if ( _blocks[i].hasAction(action) ) {
AddressRange r = memory().blockRange(i);
emit setStartWord(r.start - start);
@@ -139,7 +139,7 @@
emit setEndWord(r.end - start);
return;
}
- for (uint i=0; i<_blocks.count(); i++) {
+ for (int i=0; i<_blocks.count(); i++) {
if ( _blocks[i].hasAction(action) ) {
AddressRange r = memory().blockRange(i);
emit setEndWord(r.end - start);
@@ -195,7 +195,7 @@
const Protection &protection = device().config().protection();
if ( type()==MemoryRangeType::Code ) {
if ( protection.hasBootBlock() ) _bootRange = memory().bootRange();
- for (uint k=0; k<_blockRanges.count(); k++)
+ for (int k=0; k<_blockRanges.count(); k++)
_blockRanges[k] = memory().blockRange(k);
}
Protection::Type ptype = (protection.family()==Protection::CodeGuard ? Protection::HighSecurity : Protection::ProgramProtected);
@@ -212,7 +212,7 @@
_blocks[i]->unsetPalette();
if ( type()==MemoryRangeType::Code ) {
if ( _bootRange.contains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
- else for (uint k=0; k<_blockRanges.count(); k++) {
+ else for (int k=0; k<_blockRanges.count(); k++) {
if ( !_blockRanges[k].contains(address) ) continue;
_blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::blockColor(k));
break;
Modified: trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h
===================================================================
--- trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h 2012-04-07 19:38:04 UTC (rev 2866)
@@ -56,6 +56,7 @@
PicHardware *hardware() const { return static_cast<PicHardware *>(_hardware.get()); }
virtual bool verifyDeviceId();
virtual uint nbSteps(Task task, const Device::MemoryRange &range) const;
+ using Base::initProgramming;
bool initProgramming(Task task);
virtual bool checkErase();
Modified: trunk/piklab_kde4/src/libgui/device_editor.h
===================================================================
--- trunk/piklab_kde4/src/libgui/device_editor.h 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/device_editor.h 2012-04-07 19:38:04 UTC (rev 2866)
@@ -22,6 +22,7 @@
virtual PURL::Url url() const { return PURL::Url(); }
virtual void setDevice(bool force = false);
static QString guessDeviceFromFile(const PURL::Url &url);
+ using Editor::save;
virtual bool save(const PURL::Url &) { return false; }
virtual bool open(const PURL::Url &) { return true; }
virtual QValueList<uint> bookmarkLines() const { return QValueList<uint>(); }
Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -176,7 +176,7 @@
QStringList names;
for (uint i=0; Device::Package::TYPE_DATA[i].name; i++) names += Device::Package::TYPE_DATA[i].name;
qSort(names);
- for (uint i=0; i<names.count(); i++) _packageCombo->appendItem(names[i], i18n(Device::Package::data(names[i])->label));
+ for (int i=0; i<names.count(); i++) _packageCombo->appendItem(names[i], i18n(Device::Package::data(names[i])->label));
_packageCombo->setCurrentItem(Config::package());
connect(_packageCombo->widget(), SIGNAL(activated(int)), SLOT(updateList()));
fcontainer->appendWidget(_packageCombo->widget());
Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -79,7 +79,7 @@
return;
}
_current++;
- if ( _current<_names.count() && _names[_current]==name ) return;
+ if ( _current<(uint)_names.count() && _names[_current]==name ) return;
}
_names.resize(_current+1);
_names[_current] = name;
@@ -428,10 +428,10 @@
void EditorManager::switchToEditor()
{
QStringList names;
- for (uint i=0; i<_editors.count(); i++) names.append(title(*_editors[i]));
+ for (int i=0; i<_editors.count(); i++) names.append(title(*_editors[i]));
SwitchToDialog dialog(names, this);
if ( dialog.exec()!=QDialog::Accepted ) return;
- for (uint i=0; i<names.count(); i++) {
+ for (int i=0; i<names.count(); i++) {
if ( dialog.name()!=names[i] && dialog.name()!=QString("%1").arg(i+1) ) continue;
showEditor(_editors[i]);
return;
@@ -447,7 +447,7 @@
{
Q_ASSERT( _history.hasBack() );
QString s = _history.goBack();
- for (uint i=0; i<_editors.count(); i++)
+ for (int i=0; i<_editors.count(); i++)
if ( s==name(*_editors[i]) ) showEditor(_editors[i]);
}
@@ -455,7 +455,7 @@
{
Q_ASSERT( _history.hasForward() );
QString s = _history.goForward();
- for (uint i=0; i<_editors.count(); i++)
+ for (int i=0; i<_editors.count(); i++)
if ( s==name(*_editors[i]) ) showEditor(_editors[i]);
}
Modified: trunk/piklab_kde4/src/libgui/hex_editor.h
===================================================================
--- trunk/piklab_kde4/src/libgui/hex_editor.h 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/hex_editor.h 2012-04-07 19:38:04 UTC (rev 2866)
@@ -70,6 +70,7 @@
PURL::Url _url;
virtual void dropEvent(QDropEvent *e) { emit dropEventPass(e); }
+ using Editor::save;
bool save(const PURL::Url &url, const QString &fileErrorString);
bool verifyDeviceType();
virtual QWidget *createView(const Device::Data& data, QWidget *parent);
Modified: trunk/piklab_kde4/src/libgui/project_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/project_manager.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -335,7 +335,6 @@
ext[url] = Included;
return;
}
- PURL::FileProperties properties = type.data().properties;
Group grp;
switch (origin) {
case Intrinsic: grp = group(type); break;
Modified: trunk/piklab_kde4/src/libgui/watch_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/watch_view.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/watch_view.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -118,10 +118,9 @@
if ( !Register::list().isWatched(ritem->data()) ) delete ritem;
}
// add new items
- bool added = false;
QValueList<Register::TypeData> watched = Register::list().watched();
QValueVector<ListViewItem *> items(watched.count());
- for (uint k=0; k<watched.count(); k++) {
+ for (int k=0; k<watched.count(); k++) {
Q3ListViewItem *item = _root->firstChild();
for (; item; item=item->nextSibling())
if ( static_cast<ListViewItem *>(item)->data()==watched[k] ) break;
@@ -131,7 +130,6 @@
} else {
items[k] = Device::groupui(Main::deviceData()).createWatchItem(watched[k], _root);
items[k]->setBase(_base);
- added = true;
}
}
}
Modified: trunk/piklab_kde4/src/piklab-hex/main.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-hex/main.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-hex/main.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -182,7 +182,7 @@
}
if ( command=="checksum" ) {
QStringList warnings;
- Device::Memory::WarningTypes wtypes = _memory->fromHexBuffer(_source1, warnings);
+ _memory->fromHexBuffer(_source1, warnings);
for (uint i=0; i<uint(warnings.count()); i++) log(Log::LineType::Warning, warnings[i]);
log(Log::LineType::Warning, i18n("Checksum computation is experimental and is not always correct!")); // #### REMOVE ME
BitValue cs = _memory->checksum();
Modified: trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -118,12 +118,12 @@
{
// create configuration
const Pic::Config &config = static_cast<const Pic::Data &>(data).config();
- for (uint l=0; ; l++) {
+ for (int l=0; ; l++) {
// set config bits
bool ok = false;
- for (uint i=0; i<config._words.count(); i++) {
+ for (int i=0; i<config._words.count(); i++) {
const Pic::Config::Word &cword = config._words[i];
- for (uint k=0; k<cword.masks.count(); k++) {
+ for (int k=0; k<cword.masks.count(); k++) {
const Pic::Config::Mask &cmask = cword.masks[k];
if ( l<cmask.values.count() ) {
ok = true;
@@ -147,22 +147,22 @@
// check that config bits are the same
uint nbChars = static_cast<const Pic::Data &>(data).nbCharsWord(Pic::MemoryRangeType::Config);
- for (uint i=0; i<config._words.count(); i++) {
+ for (int i=0; i<config._words.count(); i++) {
const Pic::Config::Word &cword = config._words[i];
BitValue word1 = static_cast<const Pic::Memory&>(*_memory1).word(Pic::MemoryRangeType::Config, i);
BitValue word2 = static_cast<const Pic::Memory&>(*_memory2).word(Pic::MemoryRangeType::Config, i);
if ( word1==word2 ) continue;
- for (uint k=0; k<cword.masks.count(); k++) {
+ for (int k=0; k<cword.masks.count(); k++) {
const Pic::Config::Mask &cmask = cword.masks[k];
if ( cmask.value.isInside(cword.pmask) ) continue;
BitValue value1 = word1.maskWith(cmask.value);
BitValue value2 = word2.maskWith(cmask.value);
if ( value1==value2 ) continue;
QString name1, name2;
- uint l1 = 0, l2 = 0;
- for (uint l=0; l<cmask.values.count(); l++) {
+ uint l2 = 0;
+ for (int l=0; l<cmask.values.count(); l++) {
const Pic::Config::Value &value = cmask.values[l];
- if ( value.value==value1 ) { name1 = value.name; l1 = l; }
+ if ( value.value==value1 ) { name1 = value.name; }
if ( value.value==value2 ) { name2 = value.name; l2 = l; }
}
if ( name1==name2 ) continue;
Modified: trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -33,7 +33,7 @@
const Pic::Protection &protection = data.config().protection();
if ( !maskName.isEmpty() && !valueName.isEmpty() ) memory.setConfigValue(maskName, valueName);
if ( !valueName.isEmpty() ) memory.setUserIdToUnprotectedChecksum();
- for (uint i=0; i<cdata.protectedMaskNames.count(); i++) {
+ for (int i=0; i<cdata.protectedMaskNames.count(); i++) {
QString pmName = cdata.protectedMaskNames[i];
const Pic::Config::Mask *mask = data.config().findMask(pmName, 0);
for (int k=mask->values.count()-1; k>=0; k--) {
@@ -86,7 +86,7 @@
QString maskName = protection.maskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code);
const Pic::Config::Mask *mask = pdata.config().findMask(maskName);
Q_ASSERT(mask);
- for (uint i=0; i<mask->values.count(); i++) {
+ for (int i=0; i<mask->values.count(); i++) {
QString valueName = mask->values[i].name;
if ( valueName.isEmpty() ) continue; // invalid value
checkChecksum(pdata, maskName, valueName, ok);
Modified: trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -60,7 +60,7 @@
for (uint x = 0; x<16; x++) {
hardware().setPin(Clock, High);
Port::usleep(_clockDelay+5);
- if ( x>7 && hardware().readBit() ) ind |= (1 << x-8);
+ if ( x>7 && hardware().readBit() ) ind |= 1 << (x-8);
hardware().setPin(Clock, Low);
Port::usleep(_clockDelay+3);
}
@@ -69,7 +69,7 @@
for (uint x = 0; x<16; x++) {
hardware().setPin(Clock, High);
Port::usleep(_clockDelay+5);
- if ( x>7 && hardware().readBit() ) ind |= (1 << x);
+ if ( x>7 && hardware().readBit() ) ind |= 1 << x;
hardware().setPin(Clock, Low);
Port::usleep(_clockDelay+3);
}
@@ -85,7 +85,7 @@
for (uint x = 0; x<16; x++) {
hardware().setPin(Clock, High);
Port::usleep(_clockDelay+5);
- if ( x>7 && hardware().readBit() ) ind |= (1 << x-8);
+ if ( x>7 && hardware().readBit() ) ind |= 1 << (x-8);
hardware().setPin(Clock, Low);
Port::usleep(_clockDelay+3);
}
Modified: trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -278,8 +278,8 @@
if ( type==Pic::MemoryRangeType::Code ) {
doEraseCommand(0, 0x8181); // boot
for (uint i=0; i<device().config().protection().nbBlocks(); i++) {
- uint v = (1 << i);
- doEraseCommand(v + v<<8, 0x8080);
+ uint v = 1 << i;
+ doEraseCommand(v + (v<<8), 0x8080);
}
return true;
}
Modified: trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -152,7 +152,7 @@
if (!sendCommand("version", true)) return false;
version = VersionData();
QRegExp reg("\\w*\\s*(\\d+\\.\\d+\\.\\d+).*");
- for (uint i = 0; i<outputLines().count(); ++i) {
+ for (int i = 0; i<outputLines().count(); ++i) {
if (reg.exactMatch(outputLines()[i]) ) {
version = VersionData::fromString(reg.cap(1));
break;
Modified: trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -172,7 +172,7 @@
{
_configCombo->clear();
_names = _config->hardwareNames(type);
- for (uint i=0; i<_names.count(); i++) {
+ for (int i=0; i<_names.count(); i++) {
bool standard = _config->isStandardHardware(_names[i]);
QString s = (standard ? _config->label(_names[i]) : i18n("%1 <custom>").arg(_names[i]));
_configCombo->insertItem(s);
Modified: trunk/piklab_kde4/src/progs/gui/port_selector.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/port_selector.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gui/port_selector.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -94,7 +94,7 @@
if (pd.type.data().withDevice) {
_combos[pd.type.type()] = new KComboBox(true, _main);
- for (uint i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]);
+ for (int i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]);
if ( !pd.device.isEmpty() && !list.contains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device);
_combos[pd.type.type()]->setCurrentText(pd.device);
connect(_combos[pd.type.type()], SIGNAL(activated(int)), SIGNAL(changed()));
Modified: trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -46,7 +46,7 @@
if ( !receiveWords(1, 1, read) ) return false;
for (uint k=0; k<nb; k++) {
uint index = i + start + k;
- data[index]= read[5 + 2*k] & 0xFF | (read[6 + 2*k] << 8);
+ data[index]= (read[5 + 2*k] & 0xFF) | (read[6 + 2*k] << 8);
if ( vdata && index>=0x1000 && index<0x3FF0 && data[index]!=(*vdata)[index] ) {
log(Log::LineType::Error, i18n("Firmware memory does not match hex file (at address 0x%2: reading 0x%3 and expecting 0x%4).")
.arg(QString(toHex(index/2, device.nbCharsAddress())))
Modified: trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -388,7 +388,7 @@
bool Pickit2V2::Hardware::downloadData(const QValueVector<uint> &data, uint &index, bool clearBuffer)
{
- Q_ASSERT( index<data.count() );
+ Q_ASSERT( index<(uint)data.count() );
Array cmd;
uint i = 0;
if (clearBuffer) { cmd[i] = ClearDownloadBuffer; i++; }
Modified: trunk/piklab_kde4/src/tools/boost/boost.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/boost/boost.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/boost/boost.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -126,7 +126,7 @@
_newExecutableNames = (i == 0);
if (checkExecutable(Tool::Category::Linker, lines)) {
QRegExp regexp("Boost.*Version\\s+([0-9]+)\\.([0-9]+).*");
- for (uint i=0; i<lines.count(); ++i) {
+ for (int i=0; i<lines.count(); ++i) {
if (regexp.exactMatch(lines[i])) {
return VersionData(regexp.cap(1).toUInt(), regexp.cap(2).toUInt(), 0);
}
Modified: trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -87,7 +87,7 @@
if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), QString::null, 0);
else {
QStringList lines = file.readLines();
- for (uint i=0; i<lines.count(); i++) parseLine(lines[i]);
+ for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
}
}
Compile::Process::done(code);
@@ -96,7 +96,7 @@
PURL::Url CCSC::CompileFile::url(PURL::FileType type, uint i) const
{
PURL::Url url;
- Q_ASSERT( i<_data.items.count() );
+ Q_ASSERT( i<(uint)_data.items.count() );
url = _data.items[i].url;
if ( type==PURL::Nb_FileTypes ) return url;
return url.toFileType(type);
Modified: trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -17,7 +17,7 @@
{
QStringList devices = QStringList::split(' ', s.simplifyWhiteSpace().upper());
QValueList<const Device::Data *> list;
- for (uint i=0; i<devices.count(); i++) {
+ for (int i=0; i<devices.count(); i++) {
QString name = devices[i];
if ( devices[i].startsWith("P1") ) name = name.mid(1);
const Device::Data* data = Device::Lister::instance().data(name);
Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -158,7 +158,7 @@
void ToolchainConfigWidget::checkDevicesDone()
{
- for(uint i=0; i<_devicesData.count(); i++) {
+ for(int i=0; i<_devicesData.count(); i++) {
if ( _devicesData[i].process!=sender() ) continue;
if ( _devicesData[i].process->state()==::Process::Timedout ) {
_devicesLabel->setText(i18n("Timeout"));
@@ -169,7 +169,7 @@
break;
}
QValueList<const Device::Data *> list;
- for(uint i=0; i<_devicesData.count(); i++) {
+ for(int i=0; i<_devicesData.count(); i++) {
if ( !_devicesData[i].done ) return;
list += _group.getSupportedDevices(_devicesData[i].checkLines.join("\n"));
}
@@ -230,7 +230,7 @@
QStringList supported = _group.supportedDevices();
_devicesLabel->setText(i18n("Hardcoded (%1)").arg(supported.count()));
} else {
- for (uint i=0; i<_devicesData.count(); i++) {
+ for (int i=0; i<_devicesData.count(); i++) {
delete _devicesData[i].process;
_devicesData[i].process = checkDevicesProcess(i);
_devicesData[i].command = _devicesData[i].process->prettyCommand();
Modified: trunk/piklab_kde4/src/tools/jal/jal.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jal/jal.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/jal/jal.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -19,7 +19,7 @@
bool JAL::Base::checkExecutableResult(Tool::ExecutableType, QStringList &lines) const
{
QStringList tmp;
- for (uint i=0; i<lines.count(); i++)
+ for (int i=0; i<lines.count(); i++)
if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
lines = tmp;
return ( lines.count()>0 && lines[0].startsWith("jal") );
Modified: trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -20,7 +20,7 @@
bool JALV2::Base::checkExecutableResult(Tool::ExecutableType, QStringList &lines) const
{
QStringList tmp;
- for (uint i=0; i<lines.count(); i++)
+ for (int i=0; i<lines.count(); i++)
if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
lines = tmp;
return ( lines.count()>0 && lines[0].startsWith("jal") );
Modified: trunk/piklab_kde4/src/tools/list/compile_config.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_config.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_config.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -80,7 +80,7 @@
{
QStringList list;
QStringList raw = rawIncludeDirs(category);
- for (uint i=0; i<raw.size(); i++) {
+ for (int i=0; i<raw.size(); i++) {
if ( separator.isEmpty() ) list.append(prefix + raw[i] + suffix);
else if ( i==0 ) list.append(prefix + raw[i]);
else list[0] += separator + raw[i];
Modified: trunk/piklab_kde4/src/tools/list/compile_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -205,9 +205,9 @@
bool Compile::Manager::execute()
{
log(Log::DebugLevel::Extra, QString("Todo: %1").arg(_todo.count()));
- for (uint i=0; i<_todo.count(); i++) {
+ for (int i=0; i<_todo.count(); i++) {
QString s;
- for (uint k=0; k<_todo[i].items.count(); k++) {
+ for (int k=0; k<_todo[i].items.count(); k++) {
if ( k!=0 ) s += ",";
s += _todo[i].items[k].url.pretty();
}
@@ -284,7 +284,7 @@
log(Log::LineType::Information, i18n("Executing custom commands..."));
}
QStringList commands = Compile::Config::customCommands(Main::project());
- if ( _customCommandIndex==commands.count() ) {
+ if ( _customCommandIndex==(uint)commands.count() ) {
log(Log::LineType::Information, i18n("*** Success ***"), Log::Delayed);
emit success();
return true;
Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -244,7 +244,7 @@
else if (type==PURL::Library || _data.category==Tool::Category::Librarian)
return Main::project()->url().toExtension(libraryExtension());
else {
- ASSERT( i<_data.items.count() );
+ ASSERT( i<(uint)_data.items.count() );
url = _data.items[i].url;
}
if ( type==PURL::Nb_FileTypes ) return url;
@@ -268,7 +268,7 @@
FileData::List list;
QRegExp rexp("PURL::(.*)");
QStringList files = QStringList::split(" ", outputFiles());
- for (uint i=0; i<files.count(); i++) {
+ for (int i=0; i<files.count(); i++) {
if ( rexp.exactMatch(files[i]) ) {
PURL::FileType type = PURL::FileType::fromKey(rexp.cap(1));
if ( type==PURL::Nb_FileTypes ) {
Modified: trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -41,7 +41,7 @@
if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), QString::null, 0);
else {
QStringList lines = file.readLines();
- for (uint i=0; i<lines.count(); i++) parseLine(lines[i]);
+ for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
}
Compile::Process::done(code);
}
Modified: trunk/piklab_kde4/src/tools/picc/picc.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/picc/picc.cpp 2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/picc/picc.cpp 2012-04-07 19:38:04 UTC (rev 2866)
@@ -65,7 +65,7 @@
{
QValueList<const Device::Data *> list;
QStringList lines = QStringList::split('\n', s);
- for (uint i=0; i<lines.count(); i++) {
+ for (int i=0; i<lines.count(); i++) {
QRegExp re("([A-Za-z0-9]+):.*");
if ( !re.exactMatch(lines[i]) ) continue;
const Device::Data* data = Device::Lister::instance().data(re.cap(1));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|