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

List:       kde-commits
Subject:    kdeutils/kdelirc/kcmlirc
From:       Gav Wood <gav () indigoarchive ! net>
Date:       2004-09-24 23:14:56
Message-ID: 20040924231456.BFFB1126E0 () office ! kde ! org
[Download RAW message or body]

CVS commit by gav: 

Revisions for new API.


  M +2 -8      kcmlirc.cpp   1.39
  M +0 -1      kcmlirc.h   1.19


--- kdeutils/kdelirc/kcmlirc/kcmlirc.cpp  #1.38:1.39
@@ -53,8 +53,7 @@ KCMLirc::KCMLirc(QWidget *parent, const 
 {
         KGlobal::locale()->insertCatalogue( "kcmlirc" );
-#if !(KDE_VERSION_MINOR<=3 && KDE_VERSION_RELEASE<=5)
         setAboutData(new KAboutData("kcmlirc", I18N_NOOP("KDE Lirc"), VERSION, \
I18N_NOOP("The KDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright \
(c)2003 Gav Wood", I18N_NOOP("Use this to configure KDE's infrared remote control \
system in order to control any KDE application with your infrared remote control."), \
                "http://www.kde.org"));
-#endif
-        setButtons( KCModule::Help );
+        setButtons(KCModule::Help);
+        setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to \
configure bindings between your remote controls and KDE applications. Simply select \
your remote control and click Add under the Actions/Buttons list. If you want KDE to \
attempt to automatically assign buttons to a supported application's actions, try \
clicking the Auto-Populate button.</p><p>To view the recognised applications and \
remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));  bool ok;
         KApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", \
"IRKick", &ok); @@ -532,9 +531,4 @@ void KCMLirc::configChanged()
 }
 
-QString KCMLirc::quickHelp() const
-{
-    return i18n("<h1>Remote Controls</h1><p>This module allows you to configure \
bindings between your remote controls and KDE applications. Simply select your remote \
control and click Add under the Actions/Buttons list. If you want KDE to attempt to \
automatically assign buttons to a supported application's actions, try clicking the \
Auto-Populate button.</p><p>To view the recognised applications and remote controls, \
                simply select the <em>Loaded Extensions</em> tab.</p>");
-}
-
 // TODO: Take this out when I know how
 extern "C"

--- kdeutils/kdelirc/kcmlirc/kcmlirc.h  #1.18:1.19
@@ -76,5 +76,4 @@ public:
         virtual void defaults();
         virtual void configChanged();
-        virtual QString quickHelp() const;
 
         KCMLirc(QWidget *parent = 0, const char *name = 0, QStringList args = \
QStringList());


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