[Kwintv] Small kwintv3 patch

[Morten Brix Pedersen]

--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

Here's a small patch for kwintv3 against current CVS.

It changes the following (from my ChangeLog entry):

    When typing in a number with the keypad (or using the remote control
    via lirc), display the temporary channel number on the screen.

    Change key-press delay to 2 seconds instead of 3.

    Use a const reference for QString in OSDManager.


Regarding the first change, I don't know whether displayCC is the right
function to use. I couldn't read from that sources what 'CC' really
meant.


  - Morten.


--gKMricLos+KVdGMg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="kwintv3_patch.diff"

? kwintv3_patch.diff
? qtvision/.ChangeLog.swp
? qtvision/.audiomanager.cpp.swp
? qtvision/.audiomanager.h.swp
? qtvision/.lirc.cpp.swp
? qtvision/.lirc.h.swp
? qtvision/.osdmanager.cpp.swp
? qtvision/.osdmanager.h.swp
? qtvision/.qtvision.cpp.swp
? qtvision/.qtvision.desktop.swp
? qtvision/.qtvision.h.swp
? qtvision/.qtvision.moc.swp
? qtvision/.qtvisionchanneliface.h.swp
? qtvision/.qtvisionviewiface.h.swp
? qtvision/.qtvisionwidget.cpp.swp
? qtvision/.qvmixerplugin.cpp.swp
? qtvision/.qvmixerplugin.h.swp
? qtvision/.qvosdplugin.cpp.swp
? qtvision/.qvosdplugin.h.swp
? qtvision/.statusmanager.cpp.swp
? qtvision/clients/.actions.cpp.swp
? qtvision/clients/.mainwindow.cpp.swp
? qtvision/clients/.qtvisionactions.cpp.swp
? qtvision/clients/.qtvisionactions.h.swp
? qtvision/plugins/osd/elegant/.elegant.cpp.swp
? qtvision/plugins/osd/elegant/.elegant.h.swp
? qtvision/teletext/Makefile
Index: qtvision/ChangeLog
===================================================================
RCS file: /home/kde/kdenonbeta/kwintv3/qtvision/ChangeLog,v
retrieving revision 1.68
diff -u -r1.68 ChangeLog
--- qtvision/ChangeLog	11 Oct 2002 17:46:17 -0000	1.68
+++ qtvision/ChangeLog	15 Oct 2002 00:58:42 -0000
@@ -1,3 +1,12 @@
+2002-10-15 Tuesday 02:52  Morten Brix Pedersen
+
+        When typing in a number with the keypad (or using the remote control
+        via lirc), display the temporary channel number on the screen.
+
+        Change key-press delay to 2 seconds instead of 3.
+
+        Use a const reference for QString in OSDManager.
+
 2002-10-11 Friday 06:13  staikos
 
 	added more methods (without implementations)
Index: qtvision/osdmanager.cpp
===================================================================
RCS file: /home/kde/kdenonbeta/kwintv3/qtvision/osdmanager.cpp,v
retrieving revision 1.8
diff -u -r1.8 osdmanager.cpp
--- qtvision/osdmanager.cpp	4 Oct 2002 19:37:12 -0000	1.8
+++ qtvision/osdmanager.cpp	15 Oct 2002 00:58:43 -0000
@@ -82,7 +82,7 @@
 
 }
 
-void OSDManager::displayChannel(int channel, QString name) {
+void OSDManager::displayChannel(int channel, const QString& name) {
 if (_osd)
 	_osd->displayChannel(channel, name);
 }
@@ -101,7 +101,7 @@
     displayVolume((left + right) / 2);
 }
 
-void OSDManager::displayCC(QString text) {
+void OSDManager::displayCC(const QString& text) {
 if (_osd)
 	_osd->displayCC(text);
 }
Index: qtvision/osdmanager.h
===================================================================
RCS file: /home/kde/kdenonbeta/kwintv3/qtvision/osdmanager.h,v
retrieving revision 1.7
diff -u -r1.7 osdmanager.h
--- qtvision/osdmanager.h	4 Oct 2002 19:37:12 -0000	1.7
+++ qtvision/osdmanager.h	15 Oct 2002 00:58:43 -0000
@@ -44,11 +44,11 @@
     static OSDManager* self(QWidget *w);
 
 public slots:
-    void displayChannel(int channel, QString name);
+    void displayChannel(int channel, const QString& name);
     void displayMuted(bool muted);
     void displayVolume(int vol);
     void displayVolume(int left, int right);
-    void displayCC(QString text);
+    void displayCC(const QString& text);
     void scanPlugins();
     void rescanPlugins();
 
Index: qtvision/qtvision.cpp
===================================================================
RCS file: /home/kde/kdenonbeta/kwintv3/qtvision/qtvision.cpp,v
retrieving revision 1.98
diff -u -r1.98 qtvision.cpp
--- qtvision/qtvision.cpp	4 Oct 2002 19:37:12 -0000	1.98
+++ qtvision/qtvision.cpp	15 Oct 2002 00:58:44 -0000
@@ -702,6 +702,7 @@
 
     connect(this, SIGNAL(volumeChanged(int,int)), _osd, SLOT(displayVolume(int,int)));
     connect(this, SIGNAL(volumeMuted(bool)), _osd, SLOT(displayMuted(bool)));
+    connect(this, SIGNAL(channelText(const QString &)), _osd, SLOT(displayCC(const QString &)));
 
     // Connect the _viewmanager's signals to the slots to propagate configuration _changes
     connect(_viewmng, SIGNAL(setFixedAspectRatio(bool, int)), _view,
@@ -859,7 +860,7 @@
             kdDebug() << "channelText(" << "--" << _number << ")" << endl;
             emit channelText("--" + _number);
 
-            _keypresstimer->start(3000, true);  // start the count-down timer
+            _keypresstimer->start(2000, true);  // start the count-down timer
             break;
         }
         case 1:
@@ -878,7 +879,7 @@
                 kdDebug() << "channelText(" << "-" << _number << ")" << endl;
                 emit channelText("-" + _number);
             } // else
-            _keypresstimer->start(3000, true);  // start the count-down timer
+            _keypresstimer->start(2000, true);  // start the count-down timer
             break;
         }
         case 2:

--gKMricLos+KVdGMg--