[Marble-commits] KDE/kdeedu/marble/src/plugins
Patrick Spendrin
ps_ml at gmx.de
Sun Nov 15 13:44:13 CET 2009
SVN commit 1049552 by sengels:
do use mDebug instead of qDebug
M +2 -2 network/qhttp/QHttpNetworkPlugin.cpp
M +3 -3 network/qnam/QNamDownloadJob.cpp
M +1 -1 positionprovider/gpsd/GpsdConnection.cpp
M +1 -1 render/fileview/FileViewFloatItem.cpp
M +3 -3 render/geodata/GeoRendererView.cpp
M +2 -2 render/graticule/GraticulePlugin.cpp
M +3 -3 render/osmannotate/osm/OsmNdTagHandler.cpp
M +2 -2 render/osmannotate/texteditorwidget/MarbleTextEdit.cpp
M +1 -1 render/panoramio/PanoramioWidget.cpp
M +2 -2 render/panoramio/imagewidget.cpp
M +1 -1 render/panoramio/jsonparser.cpp
M +1 -1 render/photo/PhotoPlugin.cpp
M +3 -3 render/placemarks/PlacemarksPlugin.cpp
M +3 -3 render/stars/StarsPlugin.cpp
M +2 -2 render/twitter/jsonparser.cpp
M +6 -6 render/twitter/twitterPlugin.cpp
M +4 -4 render/weather/BBCParser.cpp
M +6 -6 render/weather/WeatherData.cpp
--- trunk/KDE/kdeedu/marble/src/plugins/network/qhttp/QHttpNetworkPlugin.cpp #1049551:1049552
@@ -61,7 +61,7 @@
cleanupPath = QUrl::toPercentEncoding( sourceUrl().path(), "/", " -" );
}
-// qDebug() << sourceUrl().host() << "and path=" << cleanupPath;
+// mDebug() << sourceUrl().host() << "and path=" << cleanupPath;
QHttpRequestHeader header( QLatin1String( "GET" ), cleanupPath );
header.setValue( "Connection", "Keep-Alive" );
header.setValue( "User-Agent", "Marble TinyWebBrowser" );
@@ -76,7 +76,7 @@
return;
QHttpResponseHeader responseHeader = m_http->lastResponse();
-// qDebug() << "responseHeader.statusCode():" << responseHeader.statusCode()
+// mDebug() << "responseHeader.statusCode():" << responseHeader.statusCode()
// << responseHeader.reasonPhrase();
// FIXME: Check whether this assumption is a safe on:
--- trunk/KDE/kdeedu/marble/src/plugins/network/qnam/QNamDownloadJob.cpp #1049551:1049552
@@ -45,19 +45,19 @@
{
Q_UNUSED(bytesReceived);
Q_UNUSED(bytesTotal);
-// qDebug() << "downloadProgress" << destinationFileName()
+// mDebug() << "downloadProgress" << destinationFileName()
// << bytesReceived << '/' << bytesTotal;
}
void QNamDownloadJob::error( QNetworkReply::NetworkError code )
{
- qDebug() << "error" << destinationFileName() << code;
+ mDebug() << "error" << destinationFileName() << code;
}
void QNamDownloadJob::finished()
{
QNetworkReply::NetworkError const error = m_networkReply->error();
-// qDebug() << "finished" << destinationFileName()
+// mDebug() << "finished" << destinationFileName()
// << "error" << error;
switch ( error ) {
--- trunk/KDE/kdeedu/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp #1049551:1049552
@@ -25,7 +25,7 @@
connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
m_timer.start( 1000 );
} else
- qDebug() << "Connection to gpsd failed, no position info available.";
+ mDebug() << "Connection to gpsd failed, no position info available.";
}
void GpsdConnection::update()
--- trunk/KDE/kdeedu/marble/src/plugins/render/fileview/FileViewFloatItem.cpp #1049551:1049552
@@ -246,7 +246,7 @@
void FileViewFloatItem::removeFile()
{
reinterpret_cast<FileViewModel*>(m_fileView->model())->setSelectedIndex( *m_persIndex );
- qDebug() << m_fileView->model()->data( *m_persIndex, Qt::DisplayRole ).toString();
+ mDebug() << m_fileView->model()->data( *m_persIndex, Qt::DisplayRole ).toString();
// close selected file
reinterpret_cast<FileViewModel*>(m_fileView->model())->closeFile();
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/geodata/GeoRendererView.cpp #1049551:1049552
@@ -156,7 +156,7 @@
}
if( m_painter->brush().color() != m_root->style( mapped ).polyStyle().color() ) {
-/* qDebug() << "BrushColor:"
+/* mDebug() << "BrushColor:"
<< m_root->style( mapped ).polyStyle().color()
<< m_painter->brush().color();*/
m_painter->setBrush( m_root->style( mapped ).polyStyle().color() );
@@ -176,10 +176,10 @@
if( m_currentPen.color() != m_root->style( mapped ).lineStyle().color() ||
m_currentPen.widthF() != m_root->style( mapped ).lineStyle().width() ) {
-/* qDebug() << "PenColor:"
+/* mDebug() << "PenColor:"
<< m_root->style( mapped ).lineStyle().color()
<< m_currentPen.color();
- qDebug() << "PenWidth:"
+ mDebug() << "PenWidth:"
<< m_root->style( mapped ).lineStyle().width()
<< m_currentPen.widthF();*/
m_currentPen.setColor( m_root->style( mapped ).lineStyle().color() );
--- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticulePlugin.cpp #1049551:1049552
@@ -212,7 +212,7 @@
// Coordinate line is not displayed inside the viewport
if ( latitude < fromSouthLat || toNorthLat < latitude ) {
- // qDebug() << "Lat: Out of View";
+ // mDebug() << "Lat: Out of View";
return;
}
@@ -261,7 +261,7 @@
longitude < toEastLon && fromWestLon < longitude &&
fromWestLon != -180.0 && toEastLon != +180.0 )
) {
- // qDebug() << "Lon: Out of View:" << viewLatLonAltBox.toString() << " Crossing: "<< viewLatLonAltBox.crossesDateLine() << "Longitude: " << longitude;
+ // mDebug() << "Lon: Out of View:" << viewLatLonAltBox.toString() << " Crossing: "<< viewLatLonAltBox.crossesDateLine() << "Longitude: " << longitude;
return;
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm/OsmNdTagHandler.cpp #1049551:1049552
@@ -34,13 +34,13 @@
//FIXME: problem with the stack implementation
//this should be "way"
-// qDebug() << Q_FUNC_INFO;
-// qDebug() << "parent element name:" << parent.first.first;
+// mDebug() << Q_FUNC_INFO;
+// mDebug() << "parent element name:" << parent.first.first;
Q_ASSERT( parent.first.first.compare("way") == 0 );
//this should be set because we know that the containing
// <way> element did not return 0
-// qDebug() << " parent associated node pointer:" << parent.associatedNode();
+// mDebug() << " parent associated node pointer:" << parent.associatedNode();
Q_ASSERT( parent.associatedNode() );
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/texteditorwidget/MarbleTextEdit.cpp #1049551:1049552
@@ -11,9 +11,9 @@
void MarbleTextEdit::resizeEvent ( QResizeEvent * event )
{
if( viewport()->size().height() > this->size().height() ) {
- qDebug() << "Viewport Bigger than widget!!!!!!";
+ mDebug() << "Viewport Bigger than widget!!!!!!";
} else {
- qDebug() << "viewport Smaller than widget";
+ mDebug() << "viewport Smaller than widget";
this->resize( viewport()->size() );
}
QTextEdit::resizeEvent( event );
--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/PanoramioWidget.cpp #1049551:1049552
@@ -47,7 +47,7 @@
Qt::SmoothTransformation );
}
else {
- qDebug() << "PanoramioWidget: addDownloadFile can't handle type " << type;
+ mDebug() << "PanoramioWidget: addDownloadFile can't handle type " << type;
}
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/imagewidget.cpp #1049551:1049552
@@ -15,12 +15,12 @@
void imageWidget::paintEvent(QPaintEvent * event )
{
-qDebug()<<__func__<<"painevent";
+mDebug()<<__func__<<"painevent";
}
void imageWidget::mousePressEvent ( QMouseEvent * event )
{
-qDebug()<<__func__<<"mouseevent";
+mDebug()<<__func__<<"mouseevent";
}
QPixmap * imageWidget::returnPointerToImage()
--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/jsonparser.cpp #1049551:1049552
@@ -80,7 +80,7 @@
dataStorage.upload_date = QDate( 1970, 1, 1 );
}
-// qDebug()<<":::::::"<<__func__<<myEngine.evaluate("longitude(x)").toNumber();
+// mDebug()<<":::::::"<<__func__<<myEngine.evaluate("longitude(x)").toNumber();
return dataStorage;
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/photo/PhotoPlugin.cpp #1049551:1049552
@@ -31,7 +31,7 @@
void PhotoPlugin::initialize()
{
- qDebug() << "PhotoPlugin: Initialize";
+ mDebug() << "PhotoPlugin: Initialize";
setModel( new PhotoPluginModel( this ) );
setNumberOfItems( numberOfImagesPerFetch );
m_isInitialized = true;
--- trunk/KDE/kdeedu/marble/src/plugins/render/placemarks/PlacemarksPlugin.cpp #1049551:1049552
@@ -101,7 +101,7 @@
{
if( root->style( mapped ) && root->style( mapped )->polyStyle() ) {
if( m_currentBrush.color() != root->style( mapped )->polyStyle()->color() ) {
- qDebug() << "BrushColor:" << root->style( mapped )->polyStyle()->color() << m_currentBrush.color();
+ mDebug() << "BrushColor:" << root->style( mapped )->polyStyle()->color() << m_currentBrush.color();
m_currentBrush.setColor( root->style( mapped )->polyStyle()->color() );
painter->setBrush( m_currentBrush );
}
@@ -113,8 +113,8 @@
if( root->style( mapped ) && root->style( mapped )->lineStyle() ) {
if( m_currentPen.color() != root->style( mapped )->lineStyle()->color() ||
m_currentPen.widthF() != root->style( mapped )->lineStyle()->width() ) {
- qDebug() << "PenColor:" << root->style( mapped )->lineStyle()->color() << m_currentPen.color();
- qDebug() << "PenWidth:" << root->style( mapped )->lineStyle()->width() << m_currentPen.widthF();
+ mDebug() << "PenColor:" << root->style( mapped )->lineStyle()->color() << m_currentPen.color();
+ mDebug() << "PenWidth:" << root->style( mapped )->lineStyle()->width() << m_currentPen.widthF();
m_currentPen.setColor( root->style( mapped )->lineStyle()->color() );
m_currentPen.setWidthF( root->style( mapped )->lineStyle()->width() );
painter->setPen( m_currentPen );
--- trunk/KDE/kdeedu/marble/src/plugins/render/stars/StarsPlugin.cpp #1049551:1049552
@@ -80,7 +80,7 @@
}
void StarsPlugin::loadStars() {
- qDebug() << Q_FUNC_INFO;
+ mDebug() << Q_FUNC_INFO;
// Load star data
m_stars.clear();
@@ -98,7 +98,7 @@
qint32 version;
in >> version;
if ( version > 001 ) {
- qDebug() << "stars.dat: file too new.";
+ mDebug() << "stars.dat: file too new.";
return;
}
double ra;
@@ -111,7 +111,7 @@
in >> mag;
StarPoint star( (qreal)(ra), (qreal)(de), (qreal)(mag) );
m_stars << star;
-// qDebug() << "RA:" << ra << "DE:" << de << "MAG:" << mag;
+// mDebug() << "RA:" << ra << "DE:" << de << "MAG:" << mag;
}
m_starsLoaded = true;
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/twitter/jsonparser.cpp #1049551:1049552
@@ -57,7 +57,7 @@
googleMapDataStructure jsonParser::geoCodingAPIparseObject(QString content)
{
- qDebug() << "in geoCodingAPIparseObject";
+ mDebug() << "in geoCodingAPIparseObject";
QString temp = "var myJSONObject = " + content;
googleMapDataStructure returnStructure;
@@ -67,7 +67,7 @@
returnStructure.lon = myEngine.evaluate("lon()").toNumber();
returnStructure.lat = myEngine.evaluate("lat()").toNumber();
- qDebug() << "twitter lan lon text=" << returnStructure.lat << returnStructure.lon;
+ mDebug() << "twitter lan lon text=" << returnStructure.lat << returnStructure.lon;
return returnStructure;
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/twitter/twitterPlugin.cpp #1049551:1049552
@@ -74,7 +74,7 @@
m_storagePolicy = new CacheStoragePolicy(MarbleDirs::localPath() + "/cache/");
m_downloadManager = new HttpDownloadManager(QUrl("http://twiter.com"), m_storagePolicy);
downloadtwitter(0, 0, 0.0, 0.0, 0.0, 0.0);
- qDebug() << "twitter plugin was started";
+ mDebug() << "twitter plugin was started";
}
bool twitterPlugin::isInitialized() const
@@ -111,10 +111,10 @@
{
static int counter=0;
twitterStructure temp;
-//qDebug()<<"::::"<<temp.;
+//mDebug()<<"::::"<<temp.;
//temp.twit = parsedData[counter].text ;
parsedData = twitterJsonParser.parseAllObjects(QString::fromUtf8(m_storagePolicy->data(id)), 20);
-qDebug()<<"::::::::::::::::slot"<<parsedData[0].text;
+mDebug()<<"::::::::::::::::slot"<<parsedData[0].text;
disconnect(m_downloadManager, SIGNAL(downloadComplete(QString, QString)), this, SLOT(slotJsonDownloadComplete(QString , QString)));
connect(m_downloadManager, SIGNAL(downloadComplete(QString, QString)), this, SLOT(slotGeoCodingReplyRecieved(QString , QString)));
@@ -129,7 +129,7 @@
void twitterPlugin::downloadtwitter(int rangeFrom , int rangeTo , qreal east , qreal west , qreal north , qreal south)
{
-qDebug()<<"::::::downloading"<<rangeFrom ;
+mDebug()<<"::::::downloading"<<rangeFrom ;
/** to use identi.ca line also */
m_downloadManager->addJob(QUrl("http://twitter.com/statuses/public_timeline.json"), "twitter", "twitter");
// m_downloadManager->addJob(QUrl("http://identi.ca/api/statuses/public_timeline.json"), "identica", "identica");
@@ -142,7 +142,7 @@
void twitterPlugin::findLatLonOfStreetAddress(QString streetAddress)
{
m_downloadManager->addJob("http://maps.google.com/maps/geo?q=" + streetAddress + "&output=json&key=ABQIAAAASD_v8YRzG0tBD18730KjmRTxoHoIpYL45xcSRJH0O7cH64DuXRT7rQeRcgCLAhjkteQ8vkWAATM_JQ", streetAddress, streetAddress);
- qDebug() << "twitter added Geo Coding job for " << streetAddress;
+ mDebug() << "twitter added Geo Coding job for " << streetAddress;
}
void twitterPlugin::slotGeoCodingReplyRecieved(QString relativeUrlString, QString id)
@@ -156,7 +156,7 @@
twitterData.location = GeoDataCoordinates(geoCodedData.lat, geoCodedData.lon, 1.0, GeoDataCoordinates::Degree);
twitsWithLocation.append(twitterData);
localCountOfTwitts ++;
-qDebug()<<"::::::::::::::::::::twitter count has value == " << localCountOfTwitts;
+mDebug()<<"::::::::::::::::::::twitter count has value == " << localCountOfTwitts;
if (localCountOfTwitts >= 1)
privateFlagForRenderingTwitts = 1;//1 means unblock
}
--- trunk/KDE/kdeedu/marble/src/plugins/render/weather/BBCParser.cpp #1049551:1049552
@@ -252,7 +252,7 @@
data->setWindDirection( windDirections.value( wind ) );
}
else {
- qDebug() << "UNHANDLED WIND DIRECTION, PLEASE REPORT: " << wind;
+ mDebug() << "UNHANDLED WIND DIRECTION, PLEASE REPORT: " << wind;
}
}
@@ -288,7 +288,7 @@
data->setPressureDevelopment( pressureDevelopments.value( pressureDevelopment ) );
}
else {
- qDebug() << "UNHANDLED PRESSURE DEVELOPMENT, PLEASE REPORT: "
+ mDebug() << "UNHANDLED PRESSURE DEVELOPMENT, PLEASE REPORT: "
<< pressureDevelopment;
}
}
@@ -303,7 +303,7 @@
data->setVisibilty( visibilityStates.value( visibility ) );
}
else {
- qDebug() << "UNHANDLED VISIBILITY, PLEASE REPORT: " << visibility;
+ mDebug() << "UNHANDLED VISIBILITY, PLEASE REPORT: " << visibility;
}
}
}
@@ -340,7 +340,7 @@
data->setCondition( dayConditions.value( value ) );
}
else {
- qDebug() << "UNHANDLED BBC WEATHER CONDITION, PLEASE REPORT: " << value;
+ mDebug() << "UNHANDLED BBC WEATHER CONDITION, PLEASE REPORT: " << value;
}
QString dayString = regExp.cap( 1 );
--- trunk/KDE/kdeedu/marble/src/plugins/render/weather/WeatherData.cpp #1049551:1049552
@@ -171,7 +171,7 @@
return ( temp * 1.8 ) - 459.67;
}
else {
- qDebug() << "Wrong temperature format";
+ mDebug() << "Wrong temperature format";
return 0;
}
}
@@ -188,7 +188,7 @@
return ( temp + 459.67 ) / 1.8;
}
else {
- qDebug() << "Wrong temperature format";
+ mDebug() << "Wrong temperature format";
return 0;
}
}
@@ -521,7 +521,7 @@
return 12;
}
else {
- qDebug() << "Wrong speed format";
+ mDebug() << "Wrong speed format";
return 0;
}
}
@@ -571,7 +571,7 @@
d->m_windSpeed = 34;
}
else {
- qDebug() << "Wrong speed format";
+ mDebug() << "Wrong speed format";
}
}
@@ -706,7 +706,7 @@
return d->m_pressure * HPA2IHG;
}
else {
- qDebug() << "Wrong pressure format";
+ mDebug() << "Wrong pressure format";
return 0;
}
}
@@ -730,7 +730,7 @@
d->m_pressure = pressure * IHG2HPA;
}
else {
- qDebug() << "Wrong pressure format";
+ mDebug() << "Wrong pressure format";
}
}
More information about the Marble-commits
mailing list