[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_player=3A_KDE_Extended_Player=3A_Change_qD?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-02-06 7:36:53
Message-ID: 20110206073653.DD23AA609B () git ! kde ! org
[Download RAW message or body]

Git commit 3dbf1c2fdf0558901d5885aea1b6a8d17daa1e9a by Laszlo Papp.
Committed on 06/02/11 at 08:37.
Pushed by lpapp into branch 'master'.

KDE Extended Player: Change qDebug lines to kDebug. (+ some general cleanup).

M  +1    -0    player/kdeext/CMakeLists.txt     
M  +1    -1    player/kdeext/loginform.cpp     
M  +2    -0    player/kdeext/loginform.h     
M  +4    -9    player/kdeext/mainwindow.cpp     
M  +2    -2    player/kdeext/models/listmodel.cpp     
M  +1    -1    player/kdeext/models/listmodel.h     
M  +2    -2    player/kdeext/views/newcommentform.cpp     
M  +1    -1    player/kdeext/views/newcommentform.h     

http://commits.kde.org/gluon/3dbf1c2fdf0558901d5885aea1b6a8d17daa1e9a

diff --git a/player/kdeext/CMakeLists.txt b/player/kdeext/CMakeLists.txt
index e10e8a4..4becdc1 100644
--- a/player/kdeext/CMakeLists.txt
+++ b/player/kdeext/CMakeLists.txt
@@ -13,6 +13,7 @@ set(kdeextplayer_SRCS
     gamesoverlay.cpp
     gamedetailsoverlay.cpp
     loginform.cpp
+    delegates/itemsviewbasedelegate.cpp
     models/listmodel.cpp
     views/abstractitemview.cpp
     views/achievementsview.cpp
diff --git a/player/kdeext/loginform.cpp b/player/kdeext/loginform.cpp
index 556fc0b..4c8dd05 100644
--- a/player/kdeext/loginform.cpp
+++ b/player/kdeext/loginform.cpp
@@ -84,7 +84,7 @@ void LoginForm::initDone()
 
 void LoginForm::initFailed()
 {
-    qDebug() << "Initialization failed";
+   kDebug() << "Initialization failed";
 }
 
 void LoginForm::doLogin()
diff --git a/player/kdeext/loginform.h b/player/kdeext/loginform.h
index da6bfa0..27fe49b 100644
--- a/player/kdeext/loginform.h
+++ b/player/kdeext/loginform.h
@@ -27,6 +27,7 @@
 
 #include <KDE/KLineEdit>
 #include <KDE/KPushButton>
+#include <KDE/KProgressDialog>
 
 #include <QtGui/QLabel>
 #include <QtGui/QCheckBox>
@@ -59,6 +60,7 @@ class LoginForm : public Overlay
         QLabel* m_passwordLabel;
         QLabel* m_usernameFeedbackLabel;
         QCheckBox* m_rememberMeCheckBox;
+        KProgressDialog* m_progressDialog;
 
         bool m_loggedIn;
 
diff --git a/player/kdeext/mainwindow.cpp b/player/kdeext/mainwindow.cpp
index c9b2061..f02a087 100644
--- a/player/kdeext/mainwindow.cpp
+++ b/player/kdeext/mainwindow.cpp
@@ -249,14 +249,10 @@ void MainWindow::resizeEvent( QResizeEvent* event )
 
 void MainWindow::showGames()
 {
-    if( !m_gamesOverlay )
-    {
-        m_gamesOverlay = new GamesOverlay( this );
-        m_gamesOverlay->gamesView()->setModel( m_gamesModel );
-        m_gamesOverlay->setGeometry( geometry() );
-        connect( m_gamesOverlay, SIGNAL( gameToPlaySelected( QModelIndex ) ), SLOT( \
                setProject( QModelIndex ) ) );
-        connect( m_gamesOverlay, SIGNAL( gameSelected( QModelIndex ) ), SLOT( \
                showGameDetails( QModelIndex ) ) );
-    }
+    m_gamesOverlay->gamesView()->setModel( m_gamesModel );
+    m_gamesOverlay->setGeometry( geometry() );
+    connect( m_gamesOverlay, SIGNAL( gameToPlaySelected( QModelIndex ) ), SLOT( \
setProject( QModelIndex ) ) ); +    connect( m_gamesOverlay, SIGNAL( gameSelected( \
QModelIndex ) ), SLOT( showGameDetails( QModelIndex ) ) );  
     if( m_gameDetailsOverlay )
     {
@@ -265,7 +261,6 @@ void MainWindow::showGames()
         m_gameDetailsOverlay->deleteLater();
         m_gameDetailsOverlay = 0;
     }
-
 }
 
 void MainWindow::showGameDetails( const QModelIndex& index )
diff --git a/player/kdeext/models/listmodel.cpp b/player/kdeext/models/listmodel.cpp
index cc682d3..3d6b0cc 100644
--- a/player/kdeext/models/listmodel.cpp
+++ b/player/kdeext/models/listmodel.cpp
@@ -87,13 +87,13 @@ void ListModel::clearPair( )
 // {
     // if( count != 1 )  //Don't support more than one row at a time
     // {
-        // qDebug() << "Can insert only one comment at a time";
+        // kDebug() << "Can insert only one comment at a time";
         // return false;
     // }
 
     // if( row != rowCount( parent ) )
     // {
-        // qDebug() << "Can only add a comment to the end of existing comments";
+        // kDebug() << "Can only add a comment to the end of existing comments";
         // return false;
     // }
 
diff --git a/player/kdeext/models/listmodel.h b/player/kdeext/models/listmodel.h
index 9f233f2..35aff90 100644
--- a/player/kdeext/models/listmodel.h
+++ b/player/kdeext/models/listmodel.h
@@ -23,12 +23,12 @@
 #include "gluon_player_export.h"
 
 #include <KDE/KIcon>
+#include <KDE/KDebug>
 
 #include <QtCore/QList>
 #include <QtCore/QString>
 #include <QtCore/QPair>
 #include <QtCore/QVariant>
-#include <QtCore/QDebug>
 #include <QtCore/QAbstractListModel>
 
 /**
diff --git a/player/kdeext/views/newcommentform.cpp \
b/player/kdeext/views/newcommentform.cpp index ff9fd7b..446be6c 100644
--- a/player/kdeext/views/newcommentform.cpp
+++ b/player/kdeext/views/newcommentform.cpp
@@ -64,11 +64,11 @@ void NewCommentForm::validateAndSubmit()
 {
     if( m_titleEdit->text().isEmpty() )
     {
-        qDebug() << "Empty title";
+        kDebug() << "Empty title";
     }
     if( m_bodyEdit->toPlainText().isEmpty() )
     {
-        qDebug() << "Empty body";
+        kDebug() << "Empty body";
         return;
     }
     emit accepted( m_parentIndex, m_titleEdit->text(), m_bodyEdit->toPlainText() );
diff --git a/player/kdeext/views/newcommentform.h \
b/player/kdeext/views/newcommentform.h index ea3a33d..ea430d9 100644
--- a/player/kdeext/views/newcommentform.h
+++ b/player/kdeext/views/newcommentform.h
@@ -24,10 +24,10 @@
 #include <KDE/KTextEdit>
 #include <KDE/KLocalizedString>
 #include <KDE/KLineEdit>
+#include <KDE/KDebug>
 
 #include <QtGui/QGridLayout>
 #include <QtCore/QModelIndex>
-#include <QtCore/QDebug>
 
 class NewCommentForm : public QWidget
 {


[prev in list] [next in list] [prev in thread] [next in thread]