Skip to content

Commit

Permalink
Merge pull request #1244 from simonsonc/qt-no-deprecated
Browse files Browse the repository at this point in the history
Fix uses of deprecated Qt methods
  • Loading branch information
wonder-sk committed Mar 26, 2014
2 parents 9445c9a + 3e0e0ed commit d0c93b9
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 29 deletions.
16 changes: 8 additions & 8 deletions src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ int main( int argc, char *argv[] )
}
else if ( i + 1 < argc && ( arg == "--snapshot" || arg == "-s" ) )
{
mySnapshotFileName = QDir::convertSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
mySnapshotFileName = QDir::toNativeSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--width" || arg == "-w" ) )
{
Expand All @@ -534,35 +534,35 @@ int main( int argc, char *argv[] )
}
else if ( i + 1 < argc && ( arg == "--project" || arg == "-p" ) )
{
myProjectFileName = QDir::convertSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
myProjectFileName = QDir::toNativeSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--extent" || arg == "-e" ) )
{
myInitialExtent = args[++i];
}
else if ( i + 1 < argc && ( arg == "--optionspath" || arg == "-o" ) )
{
optionpath = QDir::convertSeparators( QDir( args[++i] ).absolutePath() );
optionpath = QDir::toNativeSeparators( QDir( args[++i] ).absolutePath() );
}
else if ( i + 1 < argc && ( arg == "--configpath" || arg == "-c" ) )
{
configpath = QDir::convertSeparators( QDir( args[++i] ).absolutePath() );
configpath = QDir::toNativeSeparators( QDir( args[++i] ).absolutePath() );
}
else if ( i + 1 < argc && ( arg == "--code" || arg == "-f" ) )
{
pythonfile = QDir::convertSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
pythonfile = QDir::toNativeSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--customizationfile" || arg == "-z" ) )
{
customizationfile = QDir::convertSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
customizationfile = QDir::toNativeSeparators( QFileInfo( args[++i] ).absoluteFilePath() );
}
else if ( arg == "--defaultui" || arg == "-d" )
{
myRestoreDefaultWindowState = true;
}
else
{
myFileList.append( QDir::convertSeparators( QFileInfo( args[i] ).absoluteFilePath() ) );
myFileList.append( QDir::toNativeSeparators( QFileInfo( args[i] ).absoluteFilePath() ) );
}
}
}
Expand All @@ -578,7 +578,7 @@ int main( int argc, char *argv[] )
// check for a .qgs
for ( int i = 0; i < args.size(); i++ )
{
QString arg = QDir::convertSeparators( QFileInfo( args[i] ).absoluteFilePath() );
QString arg = QDir::toNativeSeparators( QFileInfo( args[i] ).absoluteFilePath() );
if ( arg.contains( ".qgs" ) )
{
myProjectFileName = arg;
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsattributetypedialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,12 @@ void QgsAttributeTypeDialog::loadFromCSVButtonPushed()
QString l = s.readLine().trimmed();

QString key, val;
if ( re0.indexIn( l ) >= 0 && re0.numCaptures() == 2 )
if ( re0.indexIn( l ) >= 0 && re0.captureCount() == 2 )
{
key = re0.cap( 1 ).trimmed();
val = re0.cap( 2 ).trimmed();
}
else if ( re1.indexIn( l ) >= 0 && re1.numCaptures() == 2 )
else if ( re1.indexIn( l ) >= 0 && re1.captureCount() == 2 )
{
key = re1.cap( 1 ).trimmed();
val = re1.cap( 2 ).trimmed();
Expand Down
3 changes: 1 addition & 2 deletions src/core/qgscredentials.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
#include "qgscredentials.h"
#include "qgslogger.h"

#include <QTextIStream>
#include <QTextOStream>
#include <QTextStream>

QgsCredentials *QgsCredentials::smInstance = 0;

Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgisgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace QgisGui

if ( !lastUsedFilter.isEmpty() )
{
openFileDialog->selectFilter( lastUsedFilter );
openFileDialog->selectNameFilter( lastUsedFilter );
}
openFileDialog->addCancelAll();
if ( openFileDialog->exec() == QDialog::Accepted )
Expand Down Expand Up @@ -146,7 +146,7 @@ namespace QgisGui

if ( !lastUsedFilter.isEmpty() ) // set the filter to the last one used
{
fileDialog->selectFilter( lastUsedFilter );
fileDialog->selectNameFilter( lastUsedFilter );
}

//prompt the user for a fileName
Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsdetaileditemdelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ void QgsDetailedItemDelegate::paint( QPainter * thepPainter,
{
// After painting we need to restore the painter to its original state
thepPainter->save();
if ( qVariantCanConvert<QgsDetailedItemData>( theIndex.data( Qt::UserRole ) ) )
if ( theIndex.data( Qt::UserRole ).canConvert<QgsDetailedItemData>() )
{
QgsDetailedItemData myData =
qVariantValue<QgsDetailedItemData>( theIndex.data( Qt::UserRole ) );
theIndex.data( Qt::UserRole ).value<QgsDetailedItemData>();
if ( myData.isRenderedAsWidget() )
{
paintAsWidget( thepPainter, theOption, myData );
Expand All @@ -71,10 +71,10 @@ QSize QgsDetailedItemDelegate::sizeHint(
const QStyleOptionViewItem & theOption,
const QModelIndex & theIndex ) const
{
if ( qVariantCanConvert<QgsDetailedItemData>( theIndex.data( Qt::UserRole ) ) )
if ( theIndex.data( Qt::UserRole ).canConvert<QgsDetailedItemData>() )
{
QgsDetailedItemData myData =
qVariantValue<QgsDetailedItemData>( theIndex.data( Qt::UserRole ) );
theIndex.data( Qt::UserRole ).value<QgsDetailedItemData>();
if ( myData.isRenderedAsWidget() )
{
return QSize( 378, mpWidget->height() );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsencodingfiledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget * parent,
// need to force selection of the first filter since that corresponds to
// the file name we're looking for; even if we're not here from
// findFiles_(), it won't hurt to force selection of the first file filter
selectFilter( filters().at( 0 ) );
selectNameFilter( nameFilters().at( 0 ) );

// Connect our slot to get a signal when the user is done with the file dialog
connect( this, SIGNAL( accepted() ), this, SLOT( saveUsedEncoding() ) );
Expand Down
18 changes: 9 additions & 9 deletions tests/bench/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ int main( int argc, char *argv[] )
break;

case 's':
mySnapshotFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
mySnapshotFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
break;

case 'l':
myLogFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
myLogFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
break;

case 'w':
Expand All @@ -225,7 +225,7 @@ int main( int argc, char *argv[] )
break;

case 'p':
myProjectFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
myProjectFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( optarg ) ).absoluteFilePath() );
break;

case 'e':
Expand Down Expand Up @@ -278,7 +278,7 @@ int main( int argc, char *argv[] )
int idx = optind;
QgsDebugMsg( QString( "%1: %2" ).arg( idx ).arg( argv[idx] ) );
#endif
myFileList.append( QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[optind++] ) ).absoluteFilePath() ) );
myFileList.append( QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[optind++] ) ).absoluteFilePath() ) );
}
}
#else
Expand All @@ -297,11 +297,11 @@ int main( int argc, char *argv[] )
}
else if ( i + 1 < argc && ( arg == "--snapshot" || arg == "-s" ) )
{
mySnapshotFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
mySnapshotFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--log" || arg == "-l" ) )
{
myLogFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
myLogFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--width" || arg == "-w" ) )
{
Expand All @@ -313,7 +313,7 @@ int main( int argc, char *argv[] )
}
else if ( i + 1 < argc && ( arg == "--project" || arg == "-p" ) )
{
myProjectFileName = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
myProjectFileName = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[++i] ) ).absoluteFilePath() );
}
else if ( i + 1 < argc && ( arg == "--extent" || arg == "-e" ) )
{
Expand Down Expand Up @@ -346,7 +346,7 @@ int main( int argc, char *argv[] )
}
else
{
myFileList.append( QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[i] ) ).absoluteFilePath() ) );
myFileList.append( QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[i] ) ).absoluteFilePath() ) );
}
}
#endif //WIN32
Expand Down Expand Up @@ -457,7 +457,7 @@ int main( int argc, char *argv[] )
// check for a .qgs
for ( int i = 0; i < argc; i++ )
{
QString arg = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[i] ) ).absoluteFilePath() );
QString arg = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[i] ) ).absoluteFilePath() );
if ( arg.contains( ".qgs" ) )
{
myProjectFileName = arg;
Expand Down
2 changes: 1 addition & 1 deletion tests/src/providers/testqgswcspublicservers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ int main( int argc, char *argv[] )
return 1;
}

QString myCacheDirPath = QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[optind] ) ).absoluteFilePath() ) ;
QString myCacheDirPath = QDir::toNativeSeparators( QFileInfo( QFile::decodeName( argv[optind] ) ).absoluteFilePath() ) ;

QgsDebugMsg( "myCacheDirPath = " + myCacheDirPath );

Expand Down

0 comments on commit d0c93b9

Please sign in to comment.