dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
vlp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f90e217
)
Fixed compile errors in kernel.
author
Rafał Długołęcki
<kontakt@dlugolecki.net.pl>
Fri, 12 Jul 2013 07:59:47 +0000
(09:59 +0200)
committer
Rafał Długołęcki
<kontakt@dlugolecki.net.pl>
Fri, 12 Jul 2013 07:59:47 +0000
(09:59 +0200)
src/kernel/kernel.cpp
patch
|
blob
|
history
diff --git
a/src/kernel/kernel.cpp
b/src/kernel/kernel.cpp
index f41c0a85838b0ad119ee87f8a5b9860a2fb0a9c7..086ed6349bb68367c24d23203a35253898d080eb 100644
(file)
--- a/
src/kernel/kernel.cpp
+++ b/
src/kernel/kernel.cpp
@@
-190,8
+190,8
@@
private:
bool synchro;
bool wait_for_info;
char LockPasswd[25];
bool synchro;
bool wait_for_info;
char LockPasswd[25];
- int lockid
- int unlockid
+ int lockid
;
+ int unlockid
;
int qid;
int cwid;
int optid;
int qid;
int cwid;
int optid;
@@
-371,14
+371,15
@@
void QKernel::LoadConfig(char * fname)
ConnectList.append(new ConnectEntry((char*)
config_setting_get_string(setting)));
break;
ConnectList.append(new ConnectEntry((char*)
config_setting_get_string(setting)));
break;
- case CONFIG_TYPE_ARRAY:
- int
length
= config_setting_length(setting);
- for (int i = 0; i <
length
; i++) {
+ case CONFIG_TYPE_ARRAY:
{
+ int
size
= config_setting_length(setting);
+ for (int i = 0; i <
size
; i++) {
ConnectList.append(new ConnectEntry((char*)
config_setting_get_string_elem(setting,
i)));
}
break;
ConnectList.append(new ConnectEntry((char*)
config_setting_get_string_elem(setting,
i)));
}
break;
+ }
default:
fprintf(stderr, "%s! In file %s, bad entry type for %s."
" Will not be read.\n",
default:
fprintf(stderr, "%s! In file %s, bad entry type for %s."
" Will not be read.\n",
@@
-1405,7
+1406,7
@@
int main(int argc, char **argv)
app->setStyle(new QWindowsStyle());
QKernel kernel;
app->setMainWidget(&kernel);
app->setStyle(new QWindowsStyle());
QKernel kernel;
app->setMainWidget(&kernel);
-
draw
.show();
-
draw
.InitMessage();
+
kernel
.show();
+
kernel
.InitMessage();
return app->exec();
}
return app->exec();
}