Ticket #51437: patch-remove_extern.diff

File patch-remove_extern.diff, 20.9 KB (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 8 years ago)

  • Qt4Qt5/Qsci/qsciabstractapis.h

    old new  
    2121#ifndef QSCIABSTRACTAPIS_H
    2222#define QSCIABSTRACTAPIS_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QList>
    2925#include <QObject>
    3026#include <QStringList>
    … …  
    9187    QsciAbstractAPIs &operator=(const QsciAbstractAPIs &);
    9288};
    9389
    94 #ifdef __APPLE__
    95 }
    96 #endif
    97 
    9890#endif

  • Qt4Qt5/Qsci/qsciapis.h

    old new  
    2121#ifndef QSCIAPIS_H
    2222#define QSCIAPIS_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QList>
    2925#include <QObject>
    3026#include <QPair>
    … …  
    214210    QsciAPIs &operator=(const QsciAPIs &);
    215211};
    216212
    217 #ifdef __APPLE__
    218 }
    219 #endif
    220 
    221213#endif

  • Qt4Qt5/Qsci/qscicommand.h

    old new  
    2121#ifndef QSCICOMMAND_H
    2222#define QSCICOMMAND_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qstring.h>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    406402    QsciCommand &operator=(const QsciCommand &);
    407403};
    408404
    409 #ifdef __APPLE__
    410 }
    411 #endif
    412 
    413405#endif

  • Qt4Qt5/Qsci/qscicommandset.h

    old new  
    2121#ifndef QSCICOMMANDSET_H
    2222#define QSCICOMMANDSET_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qglobal.h>
    2925
    3026#include <QList>
    … …  
    9086    QsciCommandSet &operator=(const QsciCommandSet &);
    9187};
    9288
    93 #ifdef __APPLE__
    94 }
    95 #endif
    96 
    9789#endif

  • Qt4Qt5/Qsci/qscidocument.h

    old new  
    2121#ifndef QSCIDOCUMENT_H
    2222#define QSCIDOCUMENT_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <Qsci/qsciglobal.h>
    2925
    3026
    … …  
    6258    QsciDocumentP *pdoc;
    6359};
    6460
    65 #ifdef __APPLE__
    66 }
    67 #endif
    68 
    6961#endif

  • Qt4Qt5/Qsci/qsciglobal.h

    old new  
    2121#ifndef QSCIGLOBAL_H
    2222#define QSCIGLOBAL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qglobal.h>
    2925
    3026
    … …  
    4945#define QT_END_NAMESPACE
    5046#endif
    5147
    52 #ifdef __APPLE__
    53 }
    54 #endif
    55 
    5648#endif

  • Qt4Qt5/Qsci/qscilexer.h

    old new  
    2121#ifndef QSCILEXER_H
    2222#define QSCILEXER_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QColor>
    2925#include <QFont>
    3026#include <QMap>
    … …  
    351347    QsciLexer &operator=(const QsciLexer &);
    352348};
    353349
    354 #ifdef __APPLE__
    355 }
    356 #endif
    357 
    358350#endif

  • Qt4Qt5/Qsci/qscilexeravs.h

    old new  
    2121#ifndef QSCILEXERAVS_H
    2222#define QSCILEXERAVS_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    175171    QsciLexerAVS &operator=(const QsciLexerAVS &);
    176172};
    177173
    178 #ifdef __APPLE__
    179 }
    180 #endif
    181 
    182174#endif

  • Qt4Qt5/Qsci/qscilexerbash.h

    old new  
    2121#ifndef QSCILEXERBASH_H
    2222#define QSCILEXERBASH_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    179175        QsciLexerBash &operator=(const QsciLexerBash &);
    180176};
    181177
    182 #ifdef __APPLE__
    183 }
    184 #endif
    185 
    186178#endif

  • Qt4Qt5/Qsci/qscilexerbatch.h

    old new  
    2121#ifndef QSCILEXERBATCH_H
    2222#define QSCILEXERBATCH_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    116112    QsciLexerBatch &operator=(const QsciLexerBatch &);
    117113};
    118114
    119 #ifdef __APPLE__
    120 }
    121 #endif
    122 
    123115#endif

  • Qt4Qt5/Qsci/qscilexercmake.h

    old new  
    2121#ifndef QSCILEXERCMAKE_H
    2222#define QSCILEXERCMAKE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    161157    QsciLexerCMake &operator=(const QsciLexerCMake &);
    162158};
    163159
    164 #ifdef __APPLE__
    165 }
    166 #endif
    167 
    168160#endif

  • Qt4Qt5/Qsci/qscilexercoffeescript.h

    old new  
    2121#ifndef QSCILEXERCOFFEESCRIPT_H
    2222#define QSCILEXERCOFFEESCRIPT_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    262258    QsciLexerCoffeeScript &operator=(const QsciLexerCoffeeScript &);
    263259};
    264260
    265 #ifdef __APPLE__
    266 }
    267 #endif
    268 
    269261#endif

  • Qt4Qt5/Qsci/qscilexercpp.h

    old new  
    2121#ifndef QSCILEXERCPP_H
    2222#define QSCILEXERCPP_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    399395    QsciLexerCPP &operator=(const QsciLexerCPP &);
    400396};
    401397
    402 #ifdef __APPLE__
    403 }
    404 #endif
    405 
    406398#endif

  • Qt4Qt5/Qsci/qscilexercsharp.h

    old new  
    2121#ifndef QSCILEXERCSHARP_H
    2222#define QSCILEXERCSHARP_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    7874    QsciLexerCSharp &operator=(const QsciLexerCSharp &);
    7975};
    8076
    81 #ifdef __APPLE__
    82 }
    83 #endif
    84 
    8577#endif

  • Qt4Qt5/Qsci/qscilexercss.h

    old new  
    2121#ifndef QSCILEXERCSS_H
    2222#define QSCILEXERCSS_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    253249    QsciLexerCSS &operator=(const QsciLexerCSS &);
    254250};
    255251
    256 #ifdef __APPLE__
    257 }
    258 #endif
    259 
    260252#endif

  • Qt4Qt5/Qsci/qscilexercustom.h

    old new  
    2121#ifndef QSCILEXERCUSTOM_H
    2222#define QSCILEXERCUSTOM_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <Qsci/qsciglobal.h>
    2925#include <Qsci/qscilexer.h>
    3026
    … …  
    104100    QsciLexerCustom &operator=(const QsciLexerCustom &);
    105101};
    106102
    107 #ifdef __APPLE__
    108 }
    109 #endif
    110 
    111103#endif

  • Qt4Qt5/Qsci/qscilexerd.h

    old new  
    2121#ifndef QSCILEXERD_H
    2222#define QSCILEXERD_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    243239    QsciLexerD &operator=(const QsciLexerD &);
    244240};
    245241
    246 #ifdef __APPLE__
    247 }
    248 #endif
    249 
    250242#endif

  • Qt4Qt5/Qsci/qscilexerdiff.h

    old new  
    2121#ifndef QSCILEXERDIFF_H
    2222#define QSCILEXERDIFF_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    9692    QsciLexerDiff &operator=(const QsciLexerDiff &);
    9793};
    9894
    99 #ifdef __APPLE__
    100 }
    101 #endif
    102 
    10395#endif

  • Qt4Qt5/Qsci/qscilexerfortran.h

    old new  
    2121#ifndef QSCILEXERFORTRAN_H
    2222#define QSCILEXERFORTRAN_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    6056    QsciLexerFortran &operator=(const QsciLexerFortran &);
    6157};
    6258
    63 #ifdef __APPLE__
    64 }
    65 #endif
    66 
    6759#endif

  • Qt4Qt5/Qsci/qscilexerfortran77.h

    old new  
    2121#ifndef QSCILEXERFORTRAN77_H
    2222#define QSCILEXERFORTRAN77_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    169165    QsciLexerFortran77 &operator=(const QsciLexerFortran77 &);
    170166};
    171167
    172 #ifdef __APPLE__
    173 }
    174 #endif
    175 
    176168#endif

  • Qt4Qt5/Qsci/qscilexerhtml.h

    old new  
    2121#ifndef QSCILEXERHTML_H
    2222#define QSCILEXERHTML_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    533529    QsciLexerHTML &operator=(const QsciLexerHTML &);
    534530};
    535531
    536 #ifdef __APPLE__
    537 }
    538 #endif
    539 
    540532#endif

  • Qt4Qt5/Qsci/qscilexeridl.h

    old new  
    2121#ifndef QSCILEXERIDL_H
    2222#define QSCILEXERIDL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    6561    QsciLexerIDL &operator=(const QsciLexerIDL &);
    6662};
    6763
    68 #ifdef __APPLE__
    69 }
    70 #endif
    71 
    7264#endif

  • Qt4Qt5/Qsci/qscilexerjava.h

    old new  
    2121#ifndef QSCILEXERJAVA_H
    2222#define QSCILEXERJAVA_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    5652    QsciLexerJava &operator=(const QsciLexerJava &);
    5753};
    5854
    59 #ifdef __APPLE__
    60 }
    61 #endif
    62 
    6355#endif

  • Qt4Qt5/Qsci/qscilexerjavascript.h

    old new  
    2121#ifndef QSCILEXERJSCRIPT_H
    2222#define QSCILEXERJSCRIPT_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    8278    QsciLexerJavaScript &operator=(const QsciLexerJavaScript &);
    8379};
    8480
    85 #ifdef __APPLE__
    86 }
    87 #endif
    88 
    8981#endif

  • Qt4Qt5/Qsci/qscilexerlua.h

    old new  
    2121#ifndef QSCILEXERLUA_H
    2222#define QSCILEXERLUA_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    195191    QsciLexerLua &operator=(const QsciLexerLua &);
    196192};
    197193
    198 #ifdef __APPLE__
    199 }
    200 #endif
    201 
    202194#endif

  • Qt4Qt5/Qsci/qscilexermakefile.h

    old new  
    2121#ifndef QSCILEXERMAKEFILE_H
    2222#define QSCILEXERMAKEFILE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    106102    QsciLexerMakefile &operator=(const QsciLexerMakefile &);
    107103};
    108104
    109 #ifdef __APPLE__
    110 }
    111 #endif
    112 
    113105#endif

  • Qt4Qt5/Qsci/qscilexermatlab.h

    old new  
    2121#ifndef QSCILEXERMATLAB_H
    2222#define QSCILEXERMATLAB_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    105101    QsciLexerMatlab &operator=(const QsciLexerMatlab &);
    106102};
    107103
    108 #ifdef __APPLE__
    109 }
    110 #endif
    111 
    112104#endif

  • Qt4Qt5/Qsci/qscilexeroctave.h

    old new  
    2121#ifndef QSCILEXEROCTAVE_H
    2222#define QSCILEXEROCTAVE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    6157    QsciLexerOctave &operator=(const QsciLexerOctave &);
    6258};
    6359
    64 #ifdef __APPLE__
    65 }
    66 #endif
    67 
    6860#endif

  • Qt4Qt5/Qsci/qscilexerpascal.h

    old new  
    2121#ifndef QSCILEXERPASCAL_H
    2222#define QSCILEXERPASCAL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    228224    QsciLexerPascal &operator=(const QsciLexerPascal &);
    229225};
    230226
    231 #ifdef __APPLE__
    232 }
    233 #endif
    234 
    235227#endif

  • Qt4Qt5/Qsci/qscilexerperl.h

    old new  
    2121#ifndef QSCILEXERPERL_H
    2222#define QSCILEXERPERL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    313309    QsciLexerPerl &operator=(const QsciLexerPerl &);
    314310};
    315311
    316 #ifdef __APPLE__
    317 }
    318 #endif
    319 
    320312#endif

  • Qt4Qt5/Qsci/qscilexerpo.h

    old new  
    2121#ifndef QSCILEXERPO_H
    2222#define QSCILEXERPO_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    164160    QsciLexerPO &operator=(const QsciLexerPO &);
    165161};
    166162
    167 #ifdef __APPLE__
    168 }
    169 #endif
    170 
    171163#endif

  • Qt4Qt5/Qsci/qscilexerpostscript.h

    old new  
    2121#ifndef QSCILEXERPOSTSCRIPT_H
    2222#define QSCILEXERPOSTSCRIPT_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    205201    QsciLexerPostScript &operator=(const QsciLexerPostScript &);
    206202};
    207203
    208 #ifdef __APPLE__
    209 }
    210 #endif
    211 
    212204#endif

  • Qt4Qt5/Qsci/qscilexerpov.h

    old new  
    2121#ifndef QSCILEXERPOV_H
    2222#define QSCILEXERPOV_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    204200    QsciLexerPOV &operator=(const QsciLexerPOV &);
    205201};
    206202
    207 #ifdef __APPLE__
    208 }
    209 #endif
    210 
    211203#endif

  • Qt4Qt5/Qsci/qscilexerproperties.h

    old new  
    2121#ifndef QSCILEXERPROPERTIES_H
    2222#define QSCILEXERPROPERTIES_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    151147    QsciLexerProperties &operator=(const QsciLexerProperties &);
    152148};
    153149
    154 #ifdef __APPLE__
    155 }
    156 #endif
    157 
    158150#endif

  • Qt4Qt5/Qsci/qscilexerpython.h

    old new  
    2121#ifndef QSCILEXERPYTHON_H
    2222#define QSCILEXERPYTHON_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    322318    QsciLexerPython &operator=(const QsciLexerPython &);
    323319};
    324320
    325 #ifdef __APPLE__
    326 }
    327 #endif
    328 
    329321#endif

  • Qt4Qt5/Qsci/qscilexerruby.h

    old new  
    2121#ifndef QSCILEXERRUBY_H
    2222#define QSCILEXERRUBY_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    241237    QsciLexerRuby &operator=(const QsciLexerRuby &);
    242238};
    243239
    244 #ifdef __APPLE__
    245 }
    246 #endif
    247 
    248240#endif

  • Qt4Qt5/Qsci/qscilexerspice.h

    old new  
    2121#ifndef QSCILEXERSPICE_H
    2222#define QSCILEXERSPICE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    107103    QsciLexerSpice &operator=(const QsciLexerSpice &);
    108104};
    109105
    110 #ifdef __APPLE__
    111 }
    112 #endif
    113 
    114106#endif

  • Qt4Qt5/Qsci/qscilexersql.h

    old new  
    2121#ifndef QSCILEXERSQL_H
    2222#define QSCILEXERSQL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    287283    QsciLexerSQL &operator=(const QsciLexerSQL &);
    288284};
    289285
    290 #ifdef __APPLE__
    291 }
    292 #endif
    293 
    294286#endif

  • Qt4Qt5/Qsci/qscilexertcl.h

    old new  
    2121#ifndef QSCILEXERTCL_H
    2222#define QSCILEXERTCL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    190186        QsciLexerTCL &operator=(const QsciLexerTCL &);
    191187};
    192188
    193 #ifdef __APPLE__
    194 }
    195 #endif
    196 
    197189#endif

  • Qt4Qt5/Qsci/qscilexertex.h

    old new  
    2121#ifndef QSCILEXERTEX_H
    2222#define QSCILEXERTEX_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    164160    QsciLexerTeX &operator=(const QsciLexerTeX &);
    165161};
    166162
    167 #ifdef __APPLE__
    168 }
    169 #endif
    170 
    171163#endif

  • Qt4Qt5/Qsci/qscilexerverilog.h

    old new  
    2121#ifndef QSCILEXERVERILOG_H
    2222#define QSCILEXERVERILOG_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    258254    QsciLexerVerilog &operator=(const QsciLexerVerilog &);
    259255};
    260256
    261 #ifdef __APPLE__
    262 }
    263 #endif
    264 
    265257#endif

  • Qt4Qt5/Qsci/qscilexervhdl.h

    old new  
    2121#ifndef QSCILEXERVHDL_H
    2222#define QSCILEXERVHDL_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    222218    QsciLexerVHDL &operator=(const QsciLexerVHDL &);
    223219};
    224220
    225 #ifdef __APPLE__
    226 }
    227 #endif
    228 
    229221#endif

  • Qt4Qt5/Qsci/qscilexerxml.h

    old new  
    2121#ifndef QSCILEXERXML_H
    2222#define QSCILEXERXML_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    107103    QsciLexerXML &operator=(const QsciLexerXML &);
    108104};
    109105
    110 #ifdef __APPLE__
    111 }
    112 #endif
    113 
    114106#endif

  • Qt4Qt5/Qsci/qscilexeryaml.h

    old new  
    2121#ifndef QSCILEXERYAML_H
    2222#define QSCILEXERYAML_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QObject>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    148144    QsciLexerYAML &operator=(const QsciLexerYAML &);
    149145};
    150146
    151 #ifdef __APPLE__
    152 }
    153 #endif
    154 
    155147#endif

  • Qt4Qt5/Qsci/qscimacro.h

    old new  
    2121#ifndef QSCIMACRO_H
    2222#define QSCIMACRO_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <QList>
    2925#include <QObject>
    3026#include <QString>
    … …  
    9995    QsciMacro &operator=(const QsciMacro &);
    10096};
    10197
    102 #ifdef __APPLE__
    103 }
    104 #endif
    105 
    10698#endif

  • Qt4Qt5/Qsci/qsciprinter.h

    old new  
    2121#ifndef QSCIPRINTER_H
    2222#define QSCIPRINTER_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824// This is needed for Qt v5.0.0-alpha.
    2925#if defined(B0)
    3026#undef B0
    … …  
    113109
    114110#endif
    115111
    116 #ifdef __APPLE__
    117 }
    118 #endif
    119 
    120112#endif

  • Qt4Qt5/Qsci/qsciscintilla.h

    old new  
    2222#ifndef QSCISCINTILLA_H
    2323#define QSCISCINTILLA_H
    2424
    25 #ifdef __APPLE__
    26 extern "C++" {
    27 #endif
    28 
    2925#include <QByteArray>
    3026#include <QList>
    3127#include <QObject>
    … …  
    21572153    QsciScintilla &operator=(const QsciScintilla &);
    21582154};
    21592155
    2160 #ifdef __APPLE__
    2161 }
    2162 #endif
    2163 
    21642156#endif

  • Qt4Qt5/Qsci/qsciscintillabase.h

    old new  
    2121#ifndef QSCISCINTILLABASE_H
    2222#define QSCISCINTILLABASE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qglobal.h>
    2925
    3026#include <QAbstractScrollArea>
    … …  
    36143610    QsciScintillaBase &operator=(const QsciScintillaBase &);
    36153611};
    36163612
    3617 #ifdef __APPLE__
    3618 }
    3619 #endif
    3620 
    36213613#endif

  • Qt4Qt5/Qsci/qscistyle.h

    old new  
    2121#ifndef QSCISTYLE_H
    2222#define QSCISTYLE_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qcolor.h>
    2925#include <qfont.h>
    3026#include <qstring.h>
    … …  
    190186    void init(int style);
    191187};
    192188
    193 #ifdef __APPLE__
    194 }
    195 #endif
    196 
    197189#endif

  • Qt4Qt5/Qsci/qscistyledtext.h

    old new  
    2121#ifndef QSCISTYLEDTEXT_H
    2222#define QSCISTYLEDTEXT_H
    2323
    24 #ifdef __APPLE__
    25 extern "C++" {
    26 #endif
    27 
    2824#include <qstring.h>
    2925
    3026#include <Qsci/qsciglobal.h>
    … …  
    6258    const QsciStyle *explicit_style;
    6359};
    6460
    65 #ifdef __APPLE__
    66 }
    67 #endif
    68 
    6961#endif