commit 5feff41265edc47d3a3a6c0c89f23d87eafc07de Author: Tomás Touceda chiiph@torproject.org Date: Sun Apr 15 15:38:33 2012 -0300

Remove use of tabs instead of spaces --- src/common/file.cpp | 6 +++--- src/vidalia/CrashReporter.cpp | 2 +- src/vidalia/config/VidaliaSettings.cpp | 2 +- src/vidalia/log/MessageLog.cpp | 18 +++++++++--------- src/vidalia/log/MessageLog.h | 4 ++-- src/vidalia/network/NetViewer.cpp | 4 ++-- src/vidalia/network/TorMapImageView.cpp | 8 ++++---- src/vidalia/network/ZImageView.cpp | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/common/file.cpp b/src/common/file.cpp index 7434bef..e746267 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -87,13 +87,13 @@ copy_dir(const QString &source, const QString &dest) if (fileInfo.isDir()) { /* This is a directory, make it and recurse */ if (!dst.mkdir(fileName)) - return false; + return false; if (!copy_dir(srcFilePath, dstFilePath)) - return false; + return false; } else if (fileInfo.isFile()) { /* This is a file, copy it */ if (!QFile::copy(srcFilePath, dstFilePath)) - return false; + return false; } /* Ignore special files (e.g. symlinks, devices) */

diff --git a/src/vidalia/CrashReporter.cpp b/src/vidalia/CrashReporter.cpp index 5f4d81b..c65f890 100644 --- a/src/vidalia/CrashReporter.cpp +++ b/src/vidalia/CrashReporter.cpp @@ -174,7 +174,7 @@ append_string(_char_t *dst, const _char_t *src, size_t siz) } *d = TEXT('\0');

- return(dlen + (s - src)); /* count does not include NUL */ + return(dlen + (s - src)); /* count does not include NUL */ }

/** Writes the formatted string "<b>key</b>=</b>val\n" to the file handle diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 41f0a32..ff9bc6d 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -47,7 +47,7 @@ #define VIDALIA_REG_KEY "Vidalia" #endif

-#define SETTING_ICON_PREF "IconPref" +#define SETTING_ICON_PREF "IconPref"

/** Default Constructor */ VidaliaSettings::VidaliaSettings() diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp index e352d86..f1a1871 100644 --- a/src/vidalia/log/MessageLog.cpp +++ b/src/vidalia/log/MessageLog.cpp @@ -130,15 +130,15 @@ MessageLog::createActions() connect(ui.btnBrowse, SIGNAL(clicked()), this, SLOT(browse()));

- QToolBar *tb = new QToolBar(tr("toolbar")); - tb->addAction(ui.actionSave_All); - tb->addAction(ui.actionSave_Selected); - tb->addAction(ui.actionCopy); - tb->addAction(ui.actionSelect_All); - tb->addAction(ui.actionFind); - tb->addAction(ui.actionClear); - tb->addAction(ui.actionSettings); - tb->addAction(ui.actionHelp); + QToolBar *tb = new QToolBar(tr("toolbar")); + tb->addAction(ui.actionSave_All); + tb->addAction(ui.actionSave_Selected); + tb->addAction(ui.actionCopy); + tb->addAction(ui.actionSelect_All); + tb->addAction(ui.actionFind); + tb->addAction(ui.actionClear); + tb->addAction(ui.actionSettings); + tb->addAction(ui.actionHelp);

tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); ui.verticalLayout->insertWidget(0, tb); diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h index 67772e5..1d48045 100644 --- a/src/vidalia/log/MessageLog.h +++ b/src/vidalia/log/MessageLog.h @@ -91,8 +91,8 @@ private: uint _filter; /** Stores message filter */ LogFilter* _logFilter; - /** Set to true if we will log all messages to a file. */ - bool _enableLogging; + /** Set to true if we will log all messages to a file. */ + bool _enableLogging; /** The log file used to store log messages. */ LogFile _logFile;

diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 4f7a4b8..2c6ae47 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -40,7 +40,7 @@ #endif

/* Settings key for main layout splitter state */ -#define SETTING_SPLITTER_MAIN "NetViewSplitMain" +#define SETTING_SPLITTER_MAIN "NetViewSplitMain" /* Key for network map splitter */ #define SETTING_SPLITTER_MAP "NetViewSplitMap" /* Key for router description splitter */ @@ -144,7 +144,7 @@ NetViewer::NetViewer(QWidget *parent) connect(ui.actionHelp, SIGNAL(triggered()), this, SLOT(help())); connect(ui.actionRefresh, SIGNAL(triggered()), this, SLOT(refresh())); connect(ui.treeRouterList, SIGNAL(routerSelected(QList<RouterDescriptor>)), - this, SLOT(routerSelected(QList<RouterDescriptor>))); + this, SLOT(routerSelected(QList<RouterDescriptor>))); connect(ui.treeRouterList, SIGNAL(zoomToRouter(QString)), _map, SLOT(zoomToRouter(QString))); connect(ui.treeCircuitList, SIGNAL(circuitSelected(Circuit)), diff --git a/src/vidalia/network/TorMapImageView.cpp b/src/vidalia/network/TorMapImageView.cpp index aac70d0..1675df6 100644 --- a/src/vidalia/network/TorMapImageView.cpp +++ b/src/vidalia/network/TorMapImageView.cpp @@ -233,14 +233,14 @@ TorMapImageView::toMapSpace(float latitude, float longitude) float lon;

lat = floor(longitude * (deg * lerp(abs(int(latitude)), plen)) - + width/2 + MAP_LEFT); + + width/2 + MAP_LEFT);

if (latitude < 0) { lon = floor((height/2) + (lerp(abs(int(latitude)), pdfe) * (height/2)) - + MAP_TOP); + + MAP_TOP); } else { lon = floor((height/2) - (lerp(abs(int(latitude)), pdfe) * (height/2)) - + MAP_TOP); + + MAP_TOP); }

return QPointF(lat, lon); @@ -253,7 +253,7 @@ TorMapImageView::lerp(float input, float *table) int x = int(floor(input / 5));

return ((table[x+1] - table[x]) / - (((x+1)*5) - (x*5))) * (input - x*5) + table[x]; + (((x+1)*5) - (x*5))) * (input - x*5) + table[x]; }

/** Returns the minimum size of the widget */ diff --git a/src/vidalia/network/ZImageView.cpp b/src/vidalia/network/ZImageView.cpp index 697977b..dc72643 100644 --- a/src/vidalia/network/ZImageView.cpp +++ b/src/vidalia/network/ZImageView.cpp @@ -109,7 +109,7 @@ ZImageView::drawScaledImage()

// Figure out the size that the 'r' region will be when drawn to the screen. QSize scaleTo(int(double(r.width()) * scaleFactor), - int(double(r.height()) * scaleFactor)); + int(double(r.height()) * scaleFactor));

/** Make a copy of the image so we don't ruin the original */ QImage i = _image.copy(); @@ -123,8 +123,8 @@ ZImageView::drawScaledImage()

/** Rescale the image copy */ i = i.copy(r).scaled(scaleTo, - Qt::KeepAspectRatioByExpanding, - Qt::SmoothTransformation); + Qt::KeepAspectRatioByExpanding, + Qt::SmoothTransformation);

int extraWidth = int(double(sRect.width() - i.width()) / 2.0); int extraHeight = int(double(sRect.height() - i.height()) / 2.0); @@ -137,13 +137,13 @@ ZImageView::drawScaledImage() if (extraWidth > 0) { p.fillRect(0, 0, extraWidth, sRect.height(), background); p.fillRect(sRect.width() - extraWidth, 0, - sRect.width(), sRect.height(), background); + sRect.width(), sRect.height(), background); }

if (extraHeight > 0) { p.fillRect(0, 0, sRect.width(), extraHeight, background); p.fillRect(0, sRect.height() - extraHeight, - sRect.width(), sRect.height(), background); + sRect.width(), sRect.height(), background); }

// Finally, paint the image copy.