summaryrefslogtreecommitdiff
path: root/editors/fxite/files/patch-src_fxasq.cpp
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2018-02-16 08:12:16 +0000
committerJason E. Hale <jhale@FreeBSD.org>2018-02-16 08:12:16 +0000
commit60f61d1988e6e9ff69129fc09da760963a3236be (patch)
tree5f962027f6700e5595a5dc83cc812a8bdd7ffe35 /editors/fxite/files/patch-src_fxasq.cpp
parentnew port sysutils/getssl: Local LetsEncrypt client (diff)
Fix build with clang 6 (C++11 requires a space between literal and identifier)
Mark FOX17 option broken (Not related to clang 6 in particular, the FOX-1.7 API is ever changing due to being a development version. This project appears to be dead, so I'm not sure it is worth fixing.) recorder.cpp:104:9: error: no matching member function for call to 'prepend' NewMessage(); ^~~~~~~~~~~~ recorder.cpp:51:6: note: expanded from macro 'NewMessage' list.prepend((FXObject*)mm); ~~~~~^~~~~~~ /usr/local/include/fox-1.7/FXObjectList.h:256:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'MacroMessage *' for 1st argument FXbool prepend(TYPE* object){ return FXObjectList::prepend(object); } ^ /usr/local/include/fox-1.7/FXObjectList.h:265:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'const FXObjectListOf<MacroMessage>' for 1st argument FXbool prepend(const FXObjectListOf<TYPE>& objects){ return FXObjectList::prepend(objects); } ^ /usr/local/include/fox-1.7/FXObjectList.h:259:10: note: candidate function not viable: requires 2 arguments, but 1 was provided FXbool prepend(TYPE* object,FXival n){ return FXObjectList::prepend(object,n); } ^ /usr/local/include/fox-1.7/FXObjectList.h:262:10: note: candidate function not viable: requires 2 arguments, but 1 was provided FXbool prepend(TYPE** objects,FXival n){ return FXObjectList::prepend(objects,n); } ^ Rename/remake patches
Diffstat (limited to '')
-rw-r--r--editors/fxite/files/patch-src_fxasq.cpp (renamed from editors/fxite/files/patch-src__fxasq.cpp)10
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/fxite/files/patch-src__fxasq.cpp b/editors/fxite/files/patch-src_fxasq.cpp
index a5f5c123439e..ab32d0a5460a 100644
--- a/editors/fxite/files/patch-src__fxasq.cpp
+++ b/editors/fxite/files/patch-src_fxasq.cpp
@@ -20,7 +20,7 @@
FXWindow*obj=(FXWindow*)keylist.data(i);
if (k&&obj) {
if (IsGroup(obj)) {
-@@ -299,7 +299,7 @@ void FxAsqWin::Select(const char*key, co
+@@ -299,7 +299,7 @@ void FxAsqWin::Select(const char*key, const char*value
{
FXHorizontalFrame *frm = new FXHorizontalFrame(userbox,LAYOUT_FILL_X);
new FXLabel(frm,label,NULL);
@@ -29,7 +29,7 @@
if (list) {
list->reparent(frm);
void*p=list->getUserData();
-@@ -315,7 +315,7 @@ void FxAsqWin::Select(const char*key, co
+@@ -315,7 +315,7 @@ void FxAsqWin::Select(const char*key, const char*value
void FxAsqWin::Option(const char*key, const char*value, const char*label)
{
@@ -38,7 +38,7 @@
if (!IsList(list)) {
list=new FXListBox(userbox,NULL,0,LISTBOX_OPTS);
keylist.insert(key,list);
-@@ -327,7 +327,7 @@ void FxAsqWin::Option(const char*key, co
+@@ -327,7 +327,7 @@ void FxAsqWin::Option(const char*key, const char*value
void FxAsqWin::Group(const char*key, const char*value, const char*label)
{
@@ -47,7 +47,7 @@
if (grp) {
((FXWindow*)grp)->reparent(userbox);
grp->setText(label);
-@@ -341,7 +341,7 @@ void FxAsqWin::Group(const char*key, con
+@@ -341,7 +341,7 @@ void FxAsqWin::Group(const char*key, const char*value,
void FxAsqWin::Radio(const char*key, const char*value, const char*label)
{
@@ -56,7 +56,7 @@
if (!IsGroup(grp)) {
grp=new GroupBox(userbox,NULL);
keylist.insert(key,grp);
-@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, cons
+@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, const char*value,
FxAsqWin::~FxAsqWin()
{
void*p=NULL;