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

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2013-01-06 14:05:47
Message-ID: 20130106140547.4F29DAC86A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1330956 by uwolfer:

minor fixes and cleanups, mostly reported by 'krazy'

 M  +1 -1      core/hostpreferences.h  
 M  +4 -2      core/krdc.kcfg  
 M  +4 -4      core/krdc_export.h  
 M  +3 -3      core/remoteview.h  
 M  +2 -2      core/remoteviewfactory.h  
 M  +1 -1      krdc_approver/approvermanager.h  
 M  +3 -3      mainwindow.h  
 M  +3 -3      rdp/rdpview.cpp  
 M  +1 -1      remotedesktopsmodel.h  
 M  +1 -1      systemtrayicon.h  
 M  +1 -1      tabbedviewwidget.h  
 M  +1 -1      tubesmanager.h  
 M  +2 -1      vnc/vncclientthread.h  


--- trunk/KDE/kdenetwork/krdc/core/hostpreferences.h #1330955:1330956
@@ -28,7 +28,7 @@
 
 #include <kdemacros.h>
 
-#include <KDialog>
+#include <KDE/KDialog>
 
 #include <QDomDocument>
 
--- trunk/KDE/kdenetwork/krdc/core/krdc.kcfg #1330955:1330956
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="krdcrc"/>
   <group name="General">
     <entry name="RememberSessions" type="Bool">
--- trunk/KDE/kdenetwork/krdc/core/krdc_export.h #1330955:1330956
@@ -24,16 +24,16 @@
 #include <kdemacros.h>
 
 #ifndef KRDCCORE_EXPORT
-# if defined(MAKE_KRDCCORE_LIB)
+# if defined(KDELIBS_STATIC_LIBS)
+   /* No export/import for static libraries */
+#  define KRDCCORE_EXPORT
+# elif defined(MAKE_KRDCCORE_LIB)
    /* We are building this library */
 #  define KRDCCORE_EXPORT KDE_EXPORT
-#  define KRDCCORE_TEST_EXPORT KDE_EXPORT
 # else
    /* We are using this library */
 #  define KRDCCORE_EXPORT KDE_IMPORT
-#  define KRDCCORE_TEST_EXPORT KDE_IMPORT
 # endif
 #endif 
 
 #endif 
-
--- trunk/KDE/kdenetwork/krdc/core/remoteview.h #1330955:1330956
@@ -30,8 +30,8 @@
     #define KUrl QUrl
     #define KRDCCORE_EXPORT
 #else
-    #include <KUrl>
-    #include <KWallet/Wallet>
+    #include <KDE/KUrl>
+    #include <KDE/KWallet/Wallet>
     #include <krdc_export.h>
 #endif
 
@@ -318,7 +318,7 @@
      */
     virtual void scaleResize(int w, int h);
 
-signals:
+Q_SIGNALS:
     /**
      * Emitted when the size of the remote screen changes. Also
      * called when the size is known for the first time.
--- trunk/KDE/kdenetwork/krdc/core/remoteviewfactory.h #1330955:1330956
@@ -27,8 +27,8 @@
 #include "remoteview.h"
 
 #include <kdemacros.h>
-#include <KPluginFactory>
-#include <KPluginLoader>
+#include <KDE/KPluginFactory>
+#include <KDE/KPluginLoader>
 
 class KUrl;
 
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approvermanager.h #1330955:1330956
@@ -34,7 +34,7 @@
     Q_OBJECT
 
 public:
-    ApproverManager(QObject *parent);
+    explicit ApproverManager(QObject *parent);
     virtual ~ApproverManager();
 
     virtual void addDispatchOperation(const Tp::MethodInvocationContextPtr<> &context,
--- trunk/KDE/kdenetwork/krdc/mainwindow.h #1330955:1330956
@@ -56,7 +56,7 @@
 {
     Q_OBJECT
 public:
-    MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
     QList<RemoteView *> remoteViewList() const;
@@ -148,7 +148,7 @@
 {
     Q_OBJECT
 public:
-    MinimizePixel(QWidget *parent)
+    explicit MinimizePixel(QWidget *parent)
             : QWidget(parent) {
         setFixedSize(1, 1);
         move(QApplication::desktop()->screenGeometry().width() - 1, 0);
@@ -170,7 +170,7 @@
 {
     Q_OBJECT
 public:
-    RemoteViewScrollArea(QWidget *parent)
+    explicit RemoteViewScrollArea(QWidget *parent)
             : QScrollArea(parent) {
     }
 
--- trunk/KDE/kdenetwork/krdc/rdp/rdpview.cpp #1330955:1330956
@@ -198,13 +198,13 @@
     QString performance;
     switch (m_hostPreferences->performance()) {
     case 0:
-        performance = "m";
+        performance = 'm';
         break;
     case 1:
-        performance = "b";
+        performance = 'b';
         break;
     case 2:
-        performance = "l";
+        performance = 'l';
         break;
     default:
         break;
--- trunk/KDE/kdenetwork/krdc/remotedesktopsmodel.h #1330955:1330956
@@ -61,7 +61,7 @@
     Q_OBJECT
 
 public:
-    RemoteDesktopsModel(QObject *parent);
+    explicit RemoteDesktopsModel(QObject *parent);
     ~RemoteDesktopsModel();
 
     enum DisplayItems { Favorite, Title, LastConnected, VisitCount, Created, Source };
--- trunk/KDE/kdenetwork/krdc/systemtrayicon.h #1330955:1330956
@@ -33,7 +33,7 @@
     Q_OBJECT
 
 public:
-    SystemTrayIcon(MainWindow *parent);
+    explicit SystemTrayIcon(MainWindow *parent);
     ~SystemTrayIcon();
 
 public slots:
--- trunk/KDE/kdenetwork/krdc/tabbedviewwidget.h #1330955:1330956
@@ -32,7 +32,7 @@
     friend class TabbedViewWidget;
     Q_OBJECT
 public:
-    TabbedViewWidgetModel(KTabWidget *modelTarget);
+    explicit TabbedViewWidgetModel(KTabWidget *modelTarget);
     QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     QModelIndex parent(const QModelIndex &index) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
--- trunk/KDE/kdenetwork/krdc/tubesmanager.h #1330955:1330956
@@ -34,7 +34,7 @@
     Q_OBJECT
 
 public:
-    TubesManager(QObject *parent);
+    explicit TubesManager(QObject *parent);
     virtual ~TubesManager();
 
     void closeTube(const KUrl & url);
--- trunk/KDE/kdenetwork/krdc/vnc/vncclientthread.h #1330955:1330956
@@ -27,6 +27,7 @@
 #ifdef QTONLY
     #include <QDebug>
     #define kDebug(n) qDebug()
+    #define kError(n) qDebug()
     #define kBacktrace() ""
     #define i18n tr
 #else
@@ -83,7 +84,7 @@
 class ClientCutEvent : public ClientEvent
 {
 public:
-    ClientCutEvent(const QString &text)
+    explicit ClientCutEvent(const QString &text)
             : text(text) {}
 
     void fire(rfbClient*);
[prev in list] [next in list] [prev in thread] [next in thread]