89 lines
2.8 KiB
Plaintext
89 lines
2.8 KiB
Plaintext
$OpenBSD: patch-panelfront_h,v 1.1 2017/05/17 16:03:32 espie Exp $
|
|
|
|
Index: panelfront.h
|
|
--- panelfront.h.orig
|
|
+++ panelfront.h
|
|
@@ -58,28 +58,28 @@
|
|
#define ACS_VLINE '|'
|
|
#endif
|
|
|
|
-extern char *KismetHelpText[];
|
|
-extern char *KismetHelpTextNarrow[];
|
|
-extern char *KismetHelpDetails[];
|
|
-extern char *KismetSortText[];
|
|
-extern char *KismetSortTextNarrow[];
|
|
+extern const char *KismetHelpText[];
|
|
+extern const char *KismetHelpTextNarrow[];
|
|
+extern const char *KismetHelpDetails[];
|
|
+extern const char *KismetSortText[];
|
|
+extern const char *KismetSortTextNarrow[];
|
|
#define SORT_SIZE 10
|
|
-extern char *KismetHelpPower[];
|
|
-extern char *KismetHelpRate[];
|
|
-extern char *KismetHelpGps[];
|
|
-extern char *KismetHelpStats[];
|
|
-extern char *KismetHelpDump[];
|
|
-extern char *KismetHelpPack[];
|
|
-extern char *KismetHelpAlert[];
|
|
-extern char *KismetHelpServer[];
|
|
+extern const char *KismetHelpPower[];
|
|
+extern const char *KismetHelpRate[];
|
|
+extern const char *KismetHelpGps[];
|
|
+extern const char *KismetHelpStats[];
|
|
+extern const char *KismetHelpDump[];
|
|
+extern const char *KismetHelpPack[];
|
|
+extern const char *KismetHelpAlert[];
|
|
+extern const char *KismetHelpServer[];
|
|
|
|
-extern char *KismetClientHelpText[];
|
|
-extern char *KismetClientHelpDetails[];
|
|
-extern char *KismetClientSortText[];
|
|
-extern char *KismetClientSortTextNarrow[];
|
|
+extern const char *KismetClientHelpText[];
|
|
+extern const char *KismetClientHelpDetails[];
|
|
+extern const char *KismetClientSortText[];
|
|
+extern const char *KismetClientSortTextNarrow[];
|
|
#define CLIENT_SORT_SIZE 8
|
|
|
|
-extern char *KismetIntroText[];
|
|
+extern const char *KismetIntroText[];
|
|
|
|
// These are in the kismet_curses.cc main code
|
|
extern int sound;
|
|
@@ -118,7 +118,7 @@ class PanelFront : public Frontend { (public)
|
|
virtual int FetchDescriptor() { return fileno(stdin); };
|
|
protected:
|
|
// Curses color pair
|
|
- typedef struct color_pair {
|
|
+ struct color_pair {
|
|
color_pair() { index = -1; pair = 0; bold = 0; }
|
|
|
|
int index;
|
|
@@ -178,7 +178,7 @@ class PanelFront : public Frontend { (public)
|
|
list<kis_window *> window_list;
|
|
|
|
// Server context records for multiple servers
|
|
- typedef struct server_context {
|
|
+ struct server_context {
|
|
server_context() {
|
|
client = NULL;
|
|
quality = power = noise = 0;
|
|
@@ -241,7 +241,7 @@ class PanelFront : public Frontend { (public)
|
|
};
|
|
|
|
// Context-aware cardinfo
|
|
- typedef struct cardinfo_context {
|
|
+ struct cardinfo_context {
|
|
server_context *context;
|
|
TcpClient::card_info *cardinfo;
|
|
};
|
|
@@ -318,7 +318,7 @@ class PanelFront : public Frontend { (public)
|
|
key_handler in_input, int in_x = -1, int in_y = -1);
|
|
|
|
// Spawn a help popup
|
|
- void SpawnHelp(char **in_helptext);
|
|
+ void SpawnHelp(const char **in_helptext);
|
|
|
|
// Kill a window
|
|
void DestroyWindow(kis_window *in_window);
|