dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
vlp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to the newest upstream version.
[vlp.git]
/
help
/
help.cpp
diff --git
a/help/help.cpp
b/help/help.cpp
index 1b3cb3cc49dcd22c16de195cced40be340c9a8f3..180e54832f344824d1e01df499cf02c6c3f1512b 100644
(file)
--- a/
help/help.cpp
+++ b/
help/help.cpp
@@
-341,7
+341,7
@@
QHTML::QHTML(char *d)
pp->insertItem("User Guide",this,SLOT(user_guide()));
pp->insertItem("Language reference",this,SLOT(lang_guide()));
pp->setFont(f);
pp->insertItem("User Guide",this,SLOT(user_guide()));
pp->insertItem("Language reference",this,SLOT(lang_guide()));
pp->setFont(f);
- pp->setStyle(WindowsStyle);
+
//
pp->setStyle(WindowsStyle);
bar->insertItem("File",this,SLOT(load()));
bar->insertItem("Contents",pp);
bar->insertItem("Quit",app,SLOT(quit()));
bar->insertItem("File",this,SLOT(load()));
bar->insertItem("Contents",pp);
bar->insertItem("Quit",app,SLOT(quit()));
@@
-379,7
+379,7
@@
void QHTML::load()
if ( !s.isNull())
{
vscroll->setValue(0);
if ( !s.isNull())
{
vscroll->setValue(0);
- analyzer->LoadFile(
s.data
());
+ analyzer->LoadFile(
(char*)s.ascii
());
analyzer->PackLinks();
DrawList();
}
analyzer->PackLinks();
DrawList();
}
@@
-439,7
+439,7
@@
void QHTML::mousePressEvent(QMouseEvent *ev)
if (poms.data()[0]=='#')
{
poms=poms.right(poms.length()-1);
if (poms.data()[0]=='#')
{
poms=poms.right(poms.length()-1);
- pom1=analyzer->FindAnchor(
poms.data
());
+ pom1=analyzer->FindAnchor(
(char*)poms.ascii
());
if (pom1!=NULL)
{
vscroll->setValue(pom1->y);
if (pom1!=NULL)
{
vscroll->setValue(pom1->y);
@@
-559,8
+559,8
@@
int main( int argc, char **argv )
app = new QApplication(argc,argv);
if (argc==2) ps.sprintf(argv[1]);
else ps.sprintf(".");
app = new QApplication(argc,argv);
if (argc==2) ps.sprintf(argv[1]);
else ps.sprintf(".");
- QHTML cfg(
ps.data
());
- app->setStyle(WindowsStyle);
+ QHTML cfg(
(char*)ps.ascii
());
+
//
app->setStyle(WindowsStyle);
app->setMainWidget(&cfg);
cfg.show();
return app->exec();
app->setMainWidget(&cfg);
cfg.show();
return app->exec();