[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkamoso/2=2E0=5D_src=3A_More_coding_style_cleanup?=
From: Alex Fiestas <alex () eyeos ! org>
Date: 2011-02-01 2:45:44
Message-ID: 20110201024544.C08F7A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit cd77006b5fcf3f928ebfbd8bb172c1213d4f5cd8 by Alex Fiestas.
Committed on 01/02/11 at 03:12.
Pushed by afiestas into branch '2.0'.
More coding style cleanup
-Includes
-qDebug replaced by kDebug
-some other minor stuff such removing of "this" usage.
M +6 -6 src/kamoso.cpp
M +5 -3 src/kamosojobtracker.cpp
M +3 -2 src/pagewebcamconfigmanager.cpp
M +3 -2 src/pluginTester/main.cpp
M +5 -5 src/pluginTester/pluginTester.cpp
M +10 -9 src/plugins/youtube/kipiplugin_youtube.cpp
M +22 -20 src/plugins/youtube/youtubejob.cpp
M +3 -3 src/webcamdialog.cpp
M +12 -7 src/whitewidgetmanager.cpp
http://commits.kde.org/kamoso/cd77006b5fcf3f928ebfbd8bb172c1213d4f5cd8
diff --git a/src/kamoso.cpp b/src/kamoso.cpp
index a67bf75..11e8789 100644
--- a/src/kamoso.cpp
+++ b/src/kamoso.cpp
@@ -207,14 +207,14 @@ void Kamoso::initialize()
//Check the initial and basic config, and ask for it it doesn't exist
checkInitConfig();
- qDebug() << "Settings of kamoso:";
- qDebug() << "saveUrl: " << Settings::saveUrl();
- qDebug() << "photoTime: " << Settings::photoTime();
+ kDebug() << "Settings of kamoso:";
+ kDebug() << "saveUrl: " << Settings::saveUrl();
+ kDebug() << "photoTime: " << Settings::photoTime();
}
void Kamoso::webcamAdded()
{
- qDebug() << "A new webcam has been added";
+ kDebug() << "A new webcam has been added";
bool comboShown = deviceManager->numberOfDevices() > 1;
@@ -369,7 +369,7 @@ void Kamoso::configuration()
*/
void Kamoso::generalUpdated()
{
- qDebug() << "Settings New\n" << Settings::saveUrl();
+ kDebug() << "Settings New\n" << Settings::saveUrl();
Settings::self()->writeConfig();
dirModel->dirLister()->openUrl(Settings::saveUrl(), \
KDirLister::Reload);
@@ -397,7 +397,7 @@ Kamoso::~Kamoso()
//TODO: Abstraction of what is called on pushBtn?
void Kamoso::startCountdown(qreal minimumTime)
{
- qDebug() << Settings::photoTime();
+ kDebug() << Settings::photoTime();
int time = qMax(minimumTime, 1000.*Settings::photoTime());
m_countdown->start(time);
diff --git a/src/kamosojobtracker.cpp b/src/kamosojobtracker.cpp
index f8c2f40..de7730f 100644
--- a/src/kamosojobtracker.cpp
+++ b/src/kamosojobtracker.cpp
@@ -18,14 +18,16 @@
*************************************************************************************/
#include "kamosojobtracker.h"
+
+#include <QMouseEvent>
#include <QPainter>
-#include <QDebug>
+
+#include <KDebug>
#include <KIcon>
#include <KUrl>
#include <KJob>
#include <KNotification>
#include <KLocale>
-#include <QMouseEvent>
KamosoJobTracker::KamosoJobTracker(QWidget* parent, Qt::WindowFlags f)
: QWidget(parent, f), m_selectedJob(-1)
@@ -36,7 +38,7 @@ KamosoJobTracker::KamosoJobTracker(QWidget* parent, \
Qt::WindowFlags f) void KamosoJobTracker::registerJob(KJob* job, const \
KUrl::List& urls, const QIcon& icon) {
Q_ASSERT(!mJobs.contains(job));
- qDebug() << "Register job received!!!";
+ kDebug() << "Register job received!!!";
connect(job, SIGNAL(result(KJob*)), SLOT(unregisterJob(KJob*)));
connect(job, SIGNAL(percent(KJob*, unsigned long)), SLOT(repaint()));
mJobs.insert(job, qMakePair(urls, icon));
diff --git a/src/pagewebcamconfigmanager.cpp \
b/src/pagewebcamconfigmanager.cpp index 4084b3e..27616b0 100644
--- a/src/pagewebcamconfigmanager.cpp
+++ b/src/pagewebcamconfigmanager.cpp
@@ -18,7 +18,8 @@
*************************************************************************************/
#include "pagewebcamconfigmanager.h"
-#include <QDebug>
+
+#include <KDebug>
struct Private
{
@@ -66,7 +67,7 @@ void PageWebcamConfigManager::updateDefaultValues()
void PageWebcamConfigManager::updateWidgetsDefault()
{
- qDebug() << "Setting default values to sliders";
+ kDebug() << "Setting default values to sliders";
d->pageWebcam->brightnessSlider->setValue(0);
d->pageWebcam->contrastSlider->setValue(100);
d->pageWebcam->saturationSlider->setValue(100);
diff --git a/src/pluginTester/main.cpp b/src/pluginTester/main.cpp
index a4f0391..95fba14 100644
--- a/src/pluginTester/main.cpp
+++ b/src/pluginTester/main.cpp
@@ -25,6 +25,7 @@
#include <KApplication>
#include <KAboutData>
#include <KCmdLineArgs>
+#include <KDebug>
//This is ugly, I know, but the class is not being deleted when executing \
qApp->quit :/ static PluginTester *pluginTester;
@@ -47,8 +48,8 @@ int main(int argc, char *argv[])
KCmdLineArgs::addCmdLineOptions(options);
if (KCmdLineArgs::parsedArgs()->count() < 2) {
- qDebug("Usage: \n");
- qDebug("kamosoPluginTester pluginName file1 file2 file3...\n");
+ kDebug() << "Usage: \n";
+ kDebug() << "kamosoPluginTester pluginName file1 file2 \
file3...\n"; return -1;
}
KApplication app;
diff --git a/src/pluginTester/pluginTester.cpp \
b/src/pluginTester/pluginTester.cpp index 5417bb1..6609b39 100644
--- a/src/pluginTester/pluginTester.cpp
+++ b/src/pluginTester/pluginTester.cpp
@@ -21,7 +21,7 @@
#include "fakekipiinterface.h"
#include "fakekipiaction.h"
-#include <QDebug>
+#include <KDebug>
#include <kurl.h>
#include <KCmdLineArgs>
#include <libkipi/plugin.h>
@@ -33,11 +33,11 @@ PluginTester::PluginTester(QObject *parent) : \
QObject(parent)
QString pluginName = args->arg(0);
- qDebug() << "PluginName: " << pluginName;
- qDebug() << "Files: ";
+ kDebug() << "PluginName: " << pluginName;
+ kDebug() << "Files: ";
KUrl::List kurlList;
for (int i = 1; i < args->count(); ++i) {
- qDebug() << "\t" << args->arg(i);
+ kDebug() << "\t" << args->arg(i);
kurlList.append(KUrl(args->arg(i)));
}
@@ -52,7 +52,7 @@ PluginTester::PluginTester(QObject *parent) : \
QObject(parent) break;
}
}
- if(!found) qDebug() << "could not find:" << args->arg(0);
+ if(!found) kDebug() << "could not find:" << args->arg(0);
}
PluginTester::~PluginTester()
diff --git a/src/plugins/youtube/kipiplugin_youtube.cpp \
b/src/plugins/youtube/kipiplugin_youtube.cpp index 7b7d079..d9e3559 100644
--- a/src/plugins/youtube/kipiplugin_youtube.cpp
+++ b/src/plugins/youtube/kipiplugin_youtube.cpp
@@ -17,6 +17,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA *
*************************************************************************************/
+#include "kipiplugin_youtube.h"
+#include "youtubejobcomposite.h"
+#include "youtubejob.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QDesktopServices>
+
#include <KPluginFactory>
#include <KAboutData>
#include <KMimeType>
@@ -25,16 +33,9 @@
#include <KDialog>
#include <KMessageBox>
#include <kpassworddialog.h>
-
-#include <QAction>
-#include <QApplication>
-#include <QDebug>
-#include <QDesktopServices>
#include <kwallet.h>
-#include "kipiplugin_youtube.h"
-#include "youtubejob.h"
+#include <KDebug>
#include <libkipi/interface.h>
-#include "youtubejobcomposite.h"
using KWallet::Wallet;
@@ -52,7 +53,7 @@ KJob* YoutubePlugin::exportFiles(const QString& \
albumname)
KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>(parent());
YoutubeJobComposite* job = new YoutubeJobComposite();
foreach(const KUrl& url, interface->currentSelection().images()) {
- qDebug() << "Url to upload: " << url;
+ kDebug() << "Url to upload: " << url;
job->addYoutubeJob(new YoutubeJob(url));
}
return job;
diff --git a/src/plugins/youtube/youtubejob.cpp \
b/src/plugins/youtube/youtubejob.cpp index 9f5c114..264d104 100644
--- a/src/plugins/youtube/youtubejob.cpp
+++ b/src/plugins/youtube/youtubejob.cpp
@@ -18,14 +18,16 @@
*************************************************************************************/
#include "youtubejob.h"
-#include <QDebug>
+#include "ui_videoInfo.h"
+
+#include <QApplication>
+
+#include <KDebug>
#include <KIO/Job>
#include <KUrl>
#include <KIcon>
#include <KToolInvocation>
#include <KLocalizedString>
-#include <QApplication>
-#include "ui_videoInfo.h"
const QByteArray YoutubeJob::developerKey("AI39si41ZFrIJoZGNH0hrZPhMuUlwHc6boMLi4e-_W6elIzVUIeDO9F7ix2swtnGAiKT4yc4F4gQw6yysTGvCn1lPNyli913Xg");
@@ -37,7 +39,7 @@ YoutubeJob::YoutubeJob(const KUrl& url, QObject* parent)
void YoutubeJob::start()
{
- qDebug() << "Job started";
+ kDebug() << "Job started";
checkWallet();
}
@@ -67,7 +69,7 @@ void YoutubeJob::checkWallet()
void YoutubeJob::fileOpened(KIO::Job *job, const QByteArray &data)
{
- qDebug() << "fileOPened!!";
+ kDebug() << "fileOPened!!";
job->suspend();
#warning do something to evade the cast? like adding a metadata?
KIO::SimpleJob *simpleJob = static_cast<KIO::SimpleJob*>(job);
@@ -116,7 +118,7 @@ finalData.append("</entry>");
finalData.append("\r\n");
finalData.append("\r\n");
finalData.append(data);
-// qDebug() << finalData;
+// kDebug() << finalData;
KUrl url("http://uploads.gdata.youtube.com/feeds/api/users/default/uploads");
uploadJob = KIO::http_post(url,finalData,KIO::HideProgressInfo);
uploadJob->addMetaData("cookies","none");
@@ -133,7 +135,7 @@ void YoutubeJob::moreData(KIO::Job *job, const \
QByteArray &data) {
job->suspend();
if(data.size() == 0){
- qDebug() << "Data is zero, going to end this!";
+ kDebug() << "Data is zero, going to end this!";
disconnect(uploadJob,SIGNAL(dataReq(KIO::Job*, QByteArray \
&)),this,SLOT(uploadNeedData()));
connect(uploadJob,SIGNAL(dataReq(KIO::Job*, QByteArray \
&)),this,SLOT(uploadFinal()));
@@ -141,8 +143,8 @@ void YoutubeJob::moreData(KIO::Job *job, const \
QByteArray &data) final.append("--foobarfoo--");
uploadJob->sendAsyncData(final);
}else{
- qDebug() << "Sending more data....";
-// qDebug() << data;
+ kDebug() << "Sending more data....";
+// kDebug() << data;
uploadJob->sendAsyncData(data);
}
}
@@ -150,27 +152,27 @@ void YoutubeJob::moreData(KIO::Job *job, const \
QByteArray &data) void YoutubeJob::uploadFinal()
{
//Sending an empty QByteArray the job ends
- qDebug() << "Sendind the empty packed";
+ kDebug() << "Sendind the empty packed";
uploadJob->sendAsyncData(QByteArray());
}
void YoutubeJob::uploadNeedData()
{
- qDebug() << "openFile job resumed!";
+ kDebug() << "openFile job resumed!";
openFileJob->resume();
}
void YoutubeJob::uploadDone(KIO::Job *job, const QByteArray &data)
{
- qDebug() << "Upload Response";
-// qDebug() << data.data();
+ kDebug() << "Upload Response";
+// kDebug() << data.data();
QString dataStr(data);
QRegExp rx("<media:player url='(\\S+)'/>");
dataStr.contains(rx);
-// qDebug() << rx.cap(1);
+// kDebug() << rx.cap(1);
KUrl url = rx.cap(1);
if (!url.isEmpty()) {
- qDebug() << "Url : " << url.url();
+ kDebug() << "Url : " << url.url();
job->kill();
KToolInvocation::invokeBrowser(url.url());
emit emitResult();
@@ -235,14 +237,14 @@ void YoutubeJob::login()
void YoutubeJob::loginDone(KIO::Job *job, const QByteArray &data)
{
delete job;
- qDebug() << "LoginDone, data received\n";
-// qDebug() << data.data();
+ kDebug() << "LoginDone, data received\n";
+// kDebug() << data.data();
if(data.at(0) == 'E'){
authenticated(false);
}else{
QList<QByteArray> tokens = data.split('\n');
m_authToken = tokens.first().remove(0,5);
- qDebug() << "Final AuthToken: " << m_authToken.data();
+ kDebug() << "Final AuthToken: " << m_authToken.data();
authenticated(true);
}
}
@@ -289,7 +291,7 @@ bool YoutubeJob::showDialog()
void YoutubeJob::authenticated(bool auth)
{
- qDebug() << "Authentification: " << auth ;
+ kDebug() << "Authentification: " << auth ;
if(auth == false){
if(showDialog()){
login();
@@ -298,7 +300,7 @@ void YoutubeJob::authenticated(bool auth)
}
QMap<QString, QString> videoInfo;
m_videoInfo = showVideoDialog();
- qDebug() << "File To Upload: " << m_url.path();
+ kDebug() << "File To Upload: " << m_url.path();
openFileJob = KIO::get(m_url,KIO::NoReload,KIO::HideProgressInfo);
connect(openFileJob,SIGNAL(data(KIO::Job *, const QByteArray \
&)),this,SLOT(fileOpened(KIO::Job *, const QByteArray &))); \
openFileJob->start();
diff --git a/src/webcamdialog.cpp b/src/webcamdialog.cpp
index 2b99cca..a30962c 100644
--- a/src/webcamdialog.cpp
+++ b/src/webcamdialog.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA *
*************************************************************************************/
-#include <QDebug>
+#include <KDebug>
#include <KLocale>
#include "webcamdialog.h"
@@ -46,7 +46,7 @@ void WebcamDialog::updateSettings()
{
Q_ASSERT(configManager);
if(hasChanged() == true) {
- qDebug() << "Settings changed";
+ kDebug() << "Settings changed";
configManager->updateDefaultValues();
settingsChangedSlot();
}
@@ -54,7 +54,7 @@ void WebcamDialog::updateSettings()
void WebcamDialog::updateWidgetsDefault()
{
- qDebug() << "updates widget!";
+ kDebug() << "updates widget!";
KConfigDialog::updateWidgetsDefault();
configManager->updateWidgetsDefault();
}
diff --git a/src/whitewidgetmanager.cpp b/src/whitewidgetmanager.cpp
index 240fab7..58d0d65 100644
--- a/src/whitewidgetmanager.cpp
+++ b/src/whitewidgetmanager.cpp
@@ -22,24 +22,27 @@
#include <QPainter>
#include <QTimer>
#include <QDesktopWidget>
-#include <KLocale>
-#include <KWindowSystem>
#include <QApplication>
-#include <QDebug>
+
+#include <KDebug>
+#include <KLocale>
/**
*This class create and manage 1 white widget per screen, creating an \
unified interface for all of them
*/
WhiteWidgetManager::WhiteWidgetManager(QWidget* parent) : QObject(parent)
{
- qDebug() << "WhiteWidgetManager: " << "WhiteWidgetManager has been \
instanced";
- this->createWhiteWidgets();
+ kDebug() << "WhiteWidgetManager has been instanced";
+ createWhiteWidgets();
+
//Call tick each 30 ms on showAll call
m_timer = new QTimer(this);
m_currentStep = 0;
+
//Maybe we should set it as cons again, but at the moment I'd like the \
idea to have it variable //I've also moved it to public scope
m_steps = 10;
+
connect(m_timer, SIGNAL(timeout()), SLOT(tick()));
}
@@ -48,11 +51,11 @@ WhiteWidgetManager::WhiteWidgetManager(QWidget* parent) \
: QObject(parent)
*/
void WhiteWidgetManager::createWhiteWidgets()
{
- qDebug() << "WhiteWidgetManager: " << "Creating whiteWidgets";
+ kDebug() << "Creating whiteWidgets";
WhiteWidget *whiteWidget;
QDesktopWidget *desktopInfo = qApp->desktop();
- qDebug() << "WhiteWidgetManager: " << "Num of whidgets to be created: \
" << desktopInfo->numScreens(); + kDebug() << "Num of whidgets to be \
created: " << desktopInfo->numScreens(); for(uchar \
x=0;x<desktopInfo->numScreens();x++) {
whiteWidget = new WhiteWidget;
@@ -68,6 +71,7 @@ void WhiteWidgetManager::showAll()
{
WhiteWidget *iteratorWidget;
m_timer->start(30);
+
foreach(iteratorWidget,whitewidgetList)
{
iteratorWidget->showFullScreen();
@@ -93,6 +97,7 @@ void WhiteWidgetManager::tick()
{
WhiteWidget *iteratorWidget;
m_currentStep=qMin(m_currentStep+1, m_steps);
+
foreach(iteratorWidget,whitewidgetList)
{
iteratorWidget->setWindowOpacity(m_currentStep);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic