mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-11 17:59:03 +00:00
MODIFIED: #20 Resolved build errors with stlport.
This commit is contained in:
dfighter1985
parent
d5363b521b
commit
956c83feda
14 changed files with 62 additions and 62 deletions
|
|
@ -50,8 +50,8 @@ namespace GUIEditor
|
|||
|
||||
void ActionEditor::onOkButtonClicked()
|
||||
{
|
||||
currentAction->Parameters = paramsEdit->text().toStdString();
|
||||
currentAction->Conditions = condEdit->text().toStdString();
|
||||
currentAction->Parameters = paramsEdit->text().toUtf8().constData();
|
||||
currentAction->Conditions = condEdit->text().toUtf8().constData();
|
||||
hide();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ namespace GUIEditor
|
|||
|
||||
projectParser.clear();
|
||||
|
||||
std::string projectFileName = fileName.toStdString();
|
||||
std::string projectFileName = fileName.toUtf8().constData();
|
||||
if( !projectParser.parseProjectFile( projectFileName ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
|
|
@ -186,7 +186,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProjectFileSerializer serializer;
|
||||
serializer.setFile( currentProjectFile.toStdString() );
|
||||
serializer.setFile( currentProjectFile.toUtf8().constData() );
|
||||
if( !serializer.serialize( projectFiles ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
|
|
@ -221,7 +221,7 @@ namespace GUIEditor
|
|||
dir + "/" + projectFiles.projectName.c_str() + ".xml";
|
||||
|
||||
CProjectFileSerializer serializer;
|
||||
serializer.setFile( newFile.toStdString() );
|
||||
serializer.setFile( newFile.toUtf8().constData() );
|
||||
if( !serializer.serialize( projectFiles ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
|
|
@ -231,7 +231,7 @@ namespace GUIEditor
|
|||
}
|
||||
|
||||
std::string guiFile =
|
||||
dir.toStdString() + "/" + "ui_" + projectFiles.projectName + ".xml";
|
||||
std::string( dir.toUtf8().constData() ) + "/" + "ui_" + projectFiles.projectName + ".xml";
|
||||
|
||||
WidgetSerializer widgetSerializer;
|
||||
widgetSerializer.setFile( guiFile );
|
||||
|
|
|
|||
|
|
@ -78,11 +78,11 @@ namespace GUIEditor
|
|||
if( !parser->getLinkData( currentLinkId, data ) )
|
||||
return;
|
||||
|
||||
data.expr = expressionEdit->toPlainText().toStdString();
|
||||
data.target = targetEdit->text().toStdString();
|
||||
data.action = ahEdit->text().toStdString();
|
||||
data.params = ahParamEdit->text().toStdString();
|
||||
data.cond = condEdit->text().toStdString();
|
||||
data.expr = expressionEdit->toPlainText().toUtf8().constData();
|
||||
data.target = targetEdit->text().toUtf8().constData();
|
||||
data.action = ahEdit->text().toUtf8().constData();
|
||||
data.params = ahParamEdit->text().toUtf8().constData();
|
||||
data.cond = condEdit->text().toUtf8().constData();
|
||||
parser->updateLinkData( data.id, data );
|
||||
|
||||
Q_EMIT okClicked();
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
&ok );
|
||||
if( ok )
|
||||
{
|
||||
if( CWidgetManager::getInstance()->getElementFromId( parent.toStdString() ) == NULL )
|
||||
if( CWidgetManager::getInstance()->getElementFromId( parent.toUtf8().constData() ) == NULL )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
tr( "Parent group doesn't exist" ),
|
||||
|
|
@ -96,7 +96,7 @@ namespace GUIEditor
|
|||
return;
|
||||
}
|
||||
SLinkData data;
|
||||
data.parent = parent.toStdString();
|
||||
data.parent = parent.toUtf8().constData();
|
||||
|
||||
uint32 id = CWidgetManager::getInstance()->getParser()->addLinkData( data );
|
||||
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ namespace GUIEditor
|
|||
}
|
||||
|
||||
SPropEntry prop;
|
||||
prop.propName = nameEdit->text().toStdString();
|
||||
prop.propType = typeCB->currentText().toStdString();
|
||||
prop.propDefault = defvalEdit->text().toStdString();
|
||||
prop.propName = nameEdit->text().toUtf8().constData();
|
||||
prop.propType = typeCB->currentText().toUtf8().constData();
|
||||
prop.propDefault = defvalEdit->text().toUtf8().constData();
|
||||
widgetInfoTreeNode->addPropertyToAll( prop );
|
||||
|
||||
widgetInfoTreeNode = NULL;
|
||||
|
|
@ -84,7 +84,7 @@ namespace GUIEditor
|
|||
if( widgetInfoTreeNode == NULL )
|
||||
return false;
|
||||
|
||||
if( widgetInfoTreeNode->hasProperty( nameEdit->text().toStdString() ) )
|
||||
if( widgetInfoTreeNode->hasProperty( nameEdit->text().toUtf8().constData() ) )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ namespace GUIEditor
|
|||
|
||||
bool NewWidgetWidget::checkNameField()
|
||||
{
|
||||
if( nameEdit->text().toStdString().empty() )
|
||||
if( nameEdit->text().isEmpty() )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
if( widgetInfoTree == NULL )
|
||||
return false;
|
||||
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( nameEdit->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( nameEdit->text().toUtf8().constData() );
|
||||
if( node != NULL )
|
||||
return false;
|
||||
|
||||
|
|
@ -98,16 +98,16 @@ namespace GUIEditor
|
|||
|
||||
void NewWidgetWidget::addNewWidget()
|
||||
{
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( ancestorCB->currentText().toStdString() );
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( ancestorCB->currentText().toUtf8().constData() );
|
||||
if( node == NULL )
|
||||
{
|
||||
nlerror( "Ancestor %s doesn't exist! Aborting addition!", ancestorCB->currentText().toStdString().c_str() );
|
||||
nlerror( "Ancestor %s doesn't exist! Aborting addition!", ancestorCB->currentText().toUtf8().constData() );
|
||||
return;
|
||||
}
|
||||
|
||||
SWidgetInfo info;
|
||||
info.ancestor = ancestorCB->currentText().toStdString();
|
||||
info.name = nameEdit->text().toStdString();
|
||||
info.ancestor = ancestorCB->currentText().toUtf8().constData();
|
||||
info.name = nameEdit->text().toUtf8().constData();
|
||||
info.GUIName = "C" + info.name;
|
||||
info.isAbstract = false;
|
||||
info.resolved = true;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace GUIEditor
|
|||
|
||||
currentProc = name;
|
||||
IParser *parser = CWidgetManager::getInstance()->getParser();
|
||||
CProcedure *proc = parser->getProc( name.toStdString() );
|
||||
CProcedure *proc = parser->getProc( name.toUtf8().constData() );
|
||||
|
||||
std::vector< CProcAction >::const_iterator itr;
|
||||
for( itr = proc->Actions.begin(); itr != proc->Actions.end(); ++itr )
|
||||
|
|
@ -74,7 +74,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
|
@ -96,14 +96,14 @@ namespace GUIEditor
|
|||
if( ok )
|
||||
{
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc != NULL )
|
||||
{
|
||||
proc->addAction( name.toStdString() );
|
||||
proc->addAction( name.toUtf8().constData() );
|
||||
actionList->addItem( name );
|
||||
}
|
||||
else
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toStdString().c_str() );
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -123,17 +123,17 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
|
||||
if( proc != NULL )
|
||||
{
|
||||
if( !proc->removeAction( static_cast< uint32 >( actionList->currentRow() ) ) )
|
||||
nlinfo( "Action #%d not found in procedure %s.", actionList->currentRow(), currentProc.toStdString().c_str() );
|
||||
nlinfo( "Action #%d not found in procedure %s.", actionList->currentRow(), currentProc.toUtf8().constData() );
|
||||
item = actionList->takeItem( actionList->currentRow() );
|
||||
delete item;
|
||||
}
|
||||
else
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toStdString().c_str() );
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toUtf8().constData() );
|
||||
}
|
||||
|
||||
void ProcEditor::onUpButtonClicked()
|
||||
|
|
@ -149,7 +149,7 @@ namespace GUIEditor
|
|||
if( prevItem == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ namespace GUIEditor
|
|||
if( nextItem == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ namespace GUIEditor
|
|||
if( item == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = parser->getProc( item->text().toStdString() );
|
||||
CProcedure *proc = parser->getProc( item->text().toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ namespace GUIEditor
|
|||
if( ok )
|
||||
{
|
||||
IParser *parser = CWidgetManager::getInstance()->getParser();
|
||||
if( !parser->addProc( newProc.toStdString() ) )
|
||||
if( !parser->addProc( newProc.toUtf8().constData() ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
tr( "Cannot add new procedure" ),
|
||||
|
|
@ -113,7 +113,7 @@ namespace GUIEditor
|
|||
if( button != QMessageBox::Yes )
|
||||
return;
|
||||
|
||||
if( !parser->removeProc( item->text().toStdString() ) )
|
||||
if( !parser->removeProc( item->text().toUtf8().constData() ) )
|
||||
return;
|
||||
item = procList->takeItem( procList->currentRow() );
|
||||
delete item;
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ namespace GUIEditor
|
|||
QString name = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( name.isEmpty() )
|
||||
return false;
|
||||
files.projectName = name.toStdString();
|
||||
files.projectName = name.toUtf8().constData();
|
||||
}
|
||||
else
|
||||
if( reader.name() == "version" )
|
||||
|
|
@ -137,7 +137,7 @@ namespace GUIEditor
|
|||
QString mg = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( mg.isEmpty() )
|
||||
return false;
|
||||
files.masterGroup = mg.toStdString();
|
||||
files.masterGroup = mg.toUtf8().constData();
|
||||
}
|
||||
else
|
||||
if( reader.name() == "activegroup" )
|
||||
|
|
@ -145,7 +145,7 @@ namespace GUIEditor
|
|||
QString ag = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( ag.isEmpty() )
|
||||
return false;
|
||||
files.activeGroup = ag.toStdString();
|
||||
files.activeGroup = ag.toUtf8().constData();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -171,7 +171,7 @@ namespace GUIEditor
|
|||
QString fileName = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( fileName.isEmpty() )
|
||||
return false;
|
||||
files.guiFiles.push_back( fileName.toStdString() );
|
||||
files.guiFiles.push_back( fileName.toUtf8().constData() );
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ namespace GUIEditor
|
|||
QString fileName = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( fileName.isEmpty() )
|
||||
return false;
|
||||
files.mapFiles.push_back( fileName.toStdString() );
|
||||
files.mapFiles.push_back( fileName.toUtf8().constData() );
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
for( int i = 0; i < c; i++ )
|
||||
{
|
||||
QTreeWidgetItem *item = topItem->child( i );
|
||||
projectFiles.guiFiles.push_back( item->text( 0 ).toStdString() );
|
||||
projectFiles.guiFiles.push_back( item->text( 0 ).toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ namespace GUIEditor
|
|||
for( int i = 0; i < c; i++ )
|
||||
{
|
||||
QTreeWidgetItem *item = topItem->child( i );
|
||||
projectFiles.mapFiles.push_back( item->text( 0 ).toStdString() );
|
||||
projectFiles.mapFiles.push_back( item->text( 0 ).toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ namespace GUIEditor
|
|||
CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
|
||||
if( e == NULL )
|
||||
return;
|
||||
e->setProperty( propName.toStdString(), propValue.toStdString() );
|
||||
e->setProperty( propName.toUtf8().constData(), propValue.toUtf8().constData() );
|
||||
}
|
||||
|
||||
void CPropBrowserCtrl::setupProperties( const std::string &type, const CInterfaceElement *element )
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ namespace
|
|||
item = item->parent();
|
||||
}
|
||||
|
||||
name = s.toStdString();
|
||||
name = s.toUtf8().constData();
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ namespace GUIEditor
|
|||
if( item->parent() == NULL )
|
||||
return;
|
||||
|
||||
std::string n = item->text( 0 ).toStdString();
|
||||
std::string n = item->text( 0 ).toUtf8().constData();
|
||||
std::string selection = makeFullName( item, n );
|
||||
CWidgetManager::getInstance()->setCurrentEditorSelection( selection );
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace GUIEditor{
|
|||
return;
|
||||
|
||||
QListWidgetItem *item = widgetList->item( i );
|
||||
setPropsOf( item->text().toStdString().c_str() );
|
||||
setPropsOf( item->text().toUtf8().constData() );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ namespace GUIEditor{
|
|||
if( reply != QMessageBox::Yes )
|
||||
return;
|
||||
|
||||
tree->removeNode( widgetName.toStdString() );
|
||||
tree->removeNode( widgetName.toUtf8().constData() );
|
||||
widgetPropTree->clear();
|
||||
buildWidgetList();
|
||||
}
|
||||
|
|
@ -91,12 +91,12 @@ namespace GUIEditor{
|
|||
void CWidgetProperties::onRemovePButtonClicked()
|
||||
{
|
||||
QTreeWidgetItem *item = widgetPropTree->currentItem();
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toUtf8().constData() );
|
||||
|
||||
if( ( item == NULL ) || ( node == NULL ) )
|
||||
return;
|
||||
|
||||
std::string name = item->text( 0 ).toStdString();
|
||||
std::string name = item->text( 0 ).toUtf8().constData();
|
||||
|
||||
std::vector< SPropEntry >::const_iterator itr = node->getInfo().findProp( name );
|
||||
if( itr == node->getInfo().props.end() )
|
||||
|
|
@ -133,7 +133,7 @@ namespace GUIEditor{
|
|||
if( ( widgetList->currentRow() >= widgetList->count() ) || ( widgetList->currentRow() < 0 ) )
|
||||
return;
|
||||
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toUtf8().constData() );
|
||||
if( node == NULL )
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace GUIEditor
|
|||
f.close();
|
||||
}
|
||||
else
|
||||
nlwarning( QString( "File %1 cannot be opened!" ).arg( file ).toStdString().c_str() );
|
||||
nlwarning( QString( "File %1 cannot be opened!" ).arg( file ).toUtf8().constData() );
|
||||
}
|
||||
|
||||
void CWidgetPropParser::parseGUIWidgetXML( QFile &file )
|
||||
|
|
@ -126,19 +126,19 @@ namespace GUIEditor
|
|||
if( !reader.hasError() )
|
||||
{
|
||||
if( key == "name" )
|
||||
info.name = value.toStdString();
|
||||
info.name = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "guiname" )
|
||||
info.GUIName = value.toStdString();
|
||||
info.GUIName = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "ancestor" )
|
||||
info.ancestor = value.toStdString();
|
||||
info.ancestor = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "description" )
|
||||
info.description = value.toStdString();
|
||||
info.description = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "icon" )
|
||||
info.icon == value.toStdString();
|
||||
info.icon == value.toUtf8().constData();
|
||||
else
|
||||
if( key == "abstract" )
|
||||
{
|
||||
|
|
@ -169,7 +169,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
std::map< std::string, SWidgetInfo >::iterator itr =
|
||||
widgetInfo->find( widgetName.toStdString() );
|
||||
widgetInfo->find( widgetName.toUtf8().constData() );
|
||||
if( itr == widgetInfo->end() )
|
||||
return;
|
||||
|
||||
|
|
@ -192,15 +192,15 @@ namespace GUIEditor
|
|||
if( !reader.hasError() )
|
||||
{
|
||||
if( key == "name" )
|
||||
prop.propName = value.toStdString();
|
||||
prop.propName = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "type" )
|
||||
prop.propType = value.toStdString();
|
||||
prop.propType = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "default" )
|
||||
prop.propDefault = value.toStdString();
|
||||
prop.propDefault = value.toUtf8().constData();
|
||||
else
|
||||
nlwarning( QString( "Unknown tag %1 within a property" ).arg( key ).toStdString().c_str() );
|
||||
nlwarning( QString( "Unknown tag %1 within a property" ).arg( key ).toUtf8().constData() );
|
||||
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue