Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 61186 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.am (-1 / +5 lines)
Lines 24-30 kwifimanager_SOURCES = interface_wirele Link Here
24
24
25
kwifimanager_LDFLAGS = $(all_libraries)
25
kwifimanager_LDFLAGS = $(all_libraries)
26
26
27
kwifimanager_LDADD = -lartsflow -lmcop -liw $(LIB_KDEUI)
27
if HAS_ARTS
28
ARTS_LIBS = -lartsflow -lmcop
29
endif
30
31
kwifimanager_LDADD = $(ARTS_LIBS) -liw $(LIB_KDEUI)
28
32
29
noinst_HEADERS =       interface_wireless.h \
33
noinst_HEADERS =       interface_wireless.h \
30
                       interface_wireless_wirelessextensions.h \
34
                       interface_wireless_wirelessextensions.h \
(-)configure.in.in (+2 lines)
Lines 57-59 AC_TRY_COMPILE( Link Here
57
)
57
)
58
58
59
AC_LANG_RESTORE
59
AC_LANG_RESTORE
60
61
AM_CONDITIONAL(HAS_ARTS, test x$have_arts = xyes)
(-)interface_wireless.cpp (+8 lines)
Lines 19-28 Link Here
19
#include <qdir.h>
19
#include <qdir.h>
20
#include <qfile.h>
20
#include <qfile.h>
21
#include <qstringlist.h>
21
#include <qstringlist.h>
22
23
#ifndef WITHOUT_ARTS
22
#include <arts/artsflow.h>
24
#include <arts/artsflow.h>
23
#include <arts/connect.h>
25
#include <arts/connect.h>
24
#include <arts/iomanager.h>
26
#include <arts/iomanager.h>
25
#include <arts/referenceclean.h>
27
#include <arts/referenceclean.h>
28
#endif WITHOUT_ARTS
29
26
#include <iostream>
30
#include <iostream>
27
#include <string>
31
#include <string>
28
#include <klocale.h>
32
#include <klocale.h>
Lines 158-163 bool Interface_wireless::get_current_qua Link Here
158
    return false;
162
    return false;
159
}
163
}
160
164
165
#ifndef WITHOUT_ARTS
166
161
void
167
void
162
sinus_wave (double frequency)
168
sinus_wave (double frequency)
163
{
169
{
Lines 187-192 MyTimeNotify::notifyTime () Link Here
187
  test->terminate ();
193
  test->terminate ();
188
}
194
}
189
195
196
#endif
197
190
QString
198
QString
191
whois (const char *MAC_ADR, QStringList APList)
199
whois (const char *MAC_ADR, QStringList APList)
192
{
200
{
(-)interface_wireless.h (+9 lines)
Lines 18-28 Link Here
18
#ifndef INTERFACE_WIRELESS_H
18
#ifndef INTERFACE_WIRELESS_H
19
#define INTERFACE_WIRELESS_H
19
#define INTERFACE_WIRELESS_H
20
20
21
#include "config.h"
22
21
#include <qobject.h>
23
#include <qobject.h>
22
#include <qstring.h>
24
#include <qstring.h>
23
#include <qstringlist.h>
25
#include <qstringlist.h>
26
27
#ifndef WITHOUT_ARTS
24
#include <arts/iomanager.h>
28
#include <arts/iomanager.h>
25
#include <arts/dispatcher.h>
29
#include <arts/dispatcher.h>
30
#endif
26
31
27
const int POLL_DELAY_MS = 250; // how much time between device polls
32
const int POLL_DELAY_MS = 250; // how much time between device polls
28
const int MAX_HISTORY = 240;   // number of device states to be saved
33
const int MAX_HISTORY = 240;   // number of device states to be saved
Lines 97-102 protected: Link Here
97
  int txpower_disabled;
102
  int txpower_disabled;
98
};
103
};
99
104
105
#ifndef WITHOUT_ARTS
106
100
void sinus_wave (double frequency);
107
void sinus_wave (double frequency);
101
108
102
class MyTimeNotify:public
109
class MyTimeNotify:public
Lines 111-116 public: Link Here
111
  void notifyTime ();
118
  void notifyTime ();
112
};
119
};
113
120
121
#endif
122
114
QString whois (const char *MAC_ADR, QStringList APList);
123
QString whois (const char *MAC_ADR, QStringList APList);
115
124
116
#endif /*  INTERFACE_WIRELESS_H */
125
#endif /*  INTERFACE_WIRELESS_H */
(-)interface_wireless_wirelessextensions.cpp (-1 / +4 lines)
Lines 15-30 Link Here
15
 *                                                                         *
15
 *                                                                         *
16
 ***************************************************************************/
16
 ***************************************************************************/
17
17
18
#include "config.h"
19
#include "interface_wireless_wirelessextensions.h"
18
#include "interface_wireless_wirelessextensions.h"
20
#include <iwlib.h>
19
#include <iwlib.h>
21
#include <qdir.h>
20
#include <qdir.h>
22
#include <qfile.h>
21
#include <qfile.h>
23
#include <qstringlist.h>
22
#include <qstringlist.h>
23
24
#ifndef WITHOUT_ARTS
24
#include <arts/artsflow.h>
25
#include <arts/artsflow.h>
25
#include <arts/connect.h>
26
#include <arts/connect.h>
26
#include <arts/iomanager.h>
27
#include <arts/iomanager.h>
27
#include <arts/referenceclean.h>
28
#include <arts/referenceclean.h>
29
#endif
30
28
#include <iostream>
31
#include <iostream>
29
#include <string>
32
#include <string>
30
#include <klocale.h>
33
#include <klocale.h>
(-)interface_wireless_wirelessextensions.h (+5 lines)
Lines 18-27 Link Here
18
#ifndef INTERFACE_WIRELESS_WIRELESSEXTENSIONS_H
18
#ifndef INTERFACE_WIRELESS_WIRELESSEXTENSIONS_H
19
#define INTERFACE_WIRELESS_WIRELESSEXTENSIONS_H
19
#define INTERFACE_WIRELESS_WIRELESSEXTENSIONS_H
20
20
21
#include "config.h"
22
21
#include <qstring.h>
23
#include <qstring.h>
22
#include <qstringlist.h>
24
#include <qstringlist.h>
25
26
#ifndef WITHOUT_ARTS
23
#include <arts/iomanager.h>
27
#include <arts/iomanager.h>
24
#include <arts/dispatcher.h>
28
#include <arts/dispatcher.h>
29
#endif
25
30
26
#include "interface_wireless.h"
31
#include "interface_wireless.h"
27
32
(-)kwifimanager.cpp (+2 lines)
Lines 453-459 KWiFiManagerApp::tricorder_beep () Link Here
453
{
453
{
454
  int sig, noi, qual;
454
  int sig, noi, qual;
455
  device->get_current_quality (sig, noi, qual);
455
  device->get_current_quality (sig, noi, qual);
456
#ifndef WITHOUT_ARTS
456
  sinus_wave (150.0 + qual * 20);
457
  sinus_wave (150.0 + qual * 20);
458
#endif
457
  if (qual == 0)
459
  if (qual == 0)
458
    {
460
    {
459
      tricorder_trigger->changeInterval (2000);
461
      tricorder_trigger->changeInterval (2000);
(-)status.cpp (+1 lines)
Lines 16-21 Link Here
16
 ***************************************************************************/
16
 ***************************************************************************/
17
17
18
#include <klocale.h>
18
#include <klocale.h>
19
#include <unistd.h>
19
#include "status.h"
20
#include "status.h"
20
#include "interface_wireless.h"
21
#include "interface_wireless.h"

Return to bug 61186