Skip to content
Permalink
Browse files

fix debug build

  • Loading branch information
jef-n committed Nov 4, 2012
1 parent 9ffca57 commit 08b05f3bdb0798cb2eb98e9834f462f5885c06d8
@@ -208,7 +208,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
// Set focus to first widget in list, to help entering data without moving the mouse.
if ( mProxyWidgets.size() > 0 )
{
(*mProxyWidgets.begin())->setFocus( Qt::OtherFocusReason );
( *mProxyWidgets.begin() )->setFocus( Qt::OtherFocusReason );
}
}
else
@@ -176,16 +176,6 @@ void QgsAttributesTree::dropEvent( QDropEvent *event )
}
}











QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent )
: QWidget( parent ), mLayer( layer )
{
@@ -99,7 +99,7 @@ class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
void on_attributeSelectionChanged();
void on_mAttributesList_cellChanged( int row, int column );
void on_pbnSelectEditForm_clicked();
void on_mEditorLayoutComboBox_currentIndexChanged ( int index );
void on_mEditorLayoutComboBox_currentIndexChanged( int index );
void addAttribute();
void deleteAttribute();

@@ -221,16 +221,16 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
{
GroupData() {}
GroupData( QString name , QList<QString> fields )
: mName ( name ), mFields( fields ) {}
: mName( name ), mFields( fields ) {}
QString mName;
QList<QString> mFields;
};

struct TabData
{
TabData() {}
TabData( QString name , QList<QString> fields , QList<GroupData> groups)
: mName ( name ), mFields( fields ), mGroups( groups ) {}
TabData( QString name , QList<QString> fields , QList<GroupData> groups )
: mName( name ), mFields( fields ), mGroups( groups ) {}
QString mName;
QList<QString> mFields;
QList<GroupData> mGroups;
@@ -60,7 +60,6 @@ class GUI_EXPORT QgsAttributeEditor : public QObject
* Creates a widget form a QgsAttributeEditorElement definition. Will recursively generate containers and widgets.
* @param widgetDef The definition for the widget
* @param parent The parent object
* @param editor The widget to prepare. Set to null if it should be generated
* @param vl The vector layer to use as data source
* @param attrs Attributes for the current feature.
* @param proxyWidgets An array of widgets, which will act as a value proxy if the same field is inserted multiple times
@@ -371,7 +371,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
if ( reg.indexIn( xmlDeclaration ) != -1 )
{
QByteArray enc = reg.cap( 2 ).toLocal8Bit();
QgsDebugMsg( QString( "found encoding name '%1'" ).arg( enc ) );
QgsDebugMsg( QString( "found encoding name '%1'" ).arg( QString::fromUtf8( enc ) ) );

codec = QTextCodec::codecForName( enc );
if ( !codec )
@@ -393,11 +393,11 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(

if ( codec )
{
QgsDebugMsg( QString( "parsing XML interface description using '%1' codec..." ).arg( codec->name() ) );
QgsDebugMsg( QString( "parsing XML interface description using '%1' codec..." ).arg( QString::fromUtf8( codec->name() ) ) );
ok = gDoc.setContent( codec->toUnicode( baDesc ), false, &err, &line, &column );
if ( !ok )
{
QgsDebugMsg( "parse FAILED using '%1' codec. Will let Qt detects encoding" );
QgsDebugMsg( "parse FAILED. Will let Qt detects encoding" );
codec = 0;
}
}

0 comments on commit 08b05f3

Please sign in to comment.
You can’t perform that action at this time.