Browse Source

Fix accidental qextscintilla conversion

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
5b3b788b37
61 changed files with 99 additions and 99 deletions
  1. +1
    -1
      designer/qscintillaplugin.cpp
  2. +2
    -2
      example/application.cpp
  3. +1
    -1
      qt/PlatQt.cpp
  4. +1
    -1
      qt/ScintillaQt.cpp
  5. +4
    -4
      qt/qextscintilla.cpp
  6. +3
    -3
      qt/qextscintilla.h
  7. +1
    -1
      qt/qextscintillaapis.cpp
  8. +1
    -1
      qt/qextscintillaapis.h
  9. +1
    -1
      qt/qextscintillabase.cpp
  10. +1
    -1
      qt/qextscintillabase.h
  11. +3
    -3
      qt/qextscintillacommand.cpp
  12. +1
    -1
      qt/qextscintillacommand.h
  13. +3
    -3
      qt/qextscintillacommandset.cpp
  14. +2
    -2
      qt/qextscintillacommandset.h
  15. +2
    -2
      qt/qextscintilladocument.cpp
  16. +1
    -1
      qt/qextscintilladocument.h
  17. +3
    -3
      qt/qextscintillalexer.cpp
  18. +1
    -1
      qt/qextscintillalexer.h
  19. +1
    -1
      qt/qextscintillalexerbash.cpp
  20. +2
    -2
      qt/qextscintillalexerbash.h
  21. +1
    -1
      qt/qextscintillalexerbatch.cpp
  22. +2
    -2
      qt/qextscintillalexerbatch.h
  23. +1
    -1
      qt/qextscintillalexercpp.cpp
  24. +2
    -2
      qt/qextscintillalexercpp.h
  25. +1
    -1
      qt/qextscintillalexercsharp.cpp
  26. +2
    -2
      qt/qextscintillalexercsharp.h
  27. +1
    -1
      qt/qextscintillalexercss.cpp
  28. +2
    -2
      qt/qextscintillalexercss.h
  29. +1
    -1
      qt/qextscintillalexerdiff.cpp
  30. +2
    -2
      qt/qextscintillalexerdiff.h
  31. +3
    -3
      qt/qextscintillalexerhtml.cpp
  32. +2
    -2
      qt/qextscintillalexerhtml.h
  33. +1
    -1
      qt/qextscintillalexeridl.cpp
  34. +2
    -2
      qt/qextscintillalexeridl.h
  35. +1
    -1
      qt/qextscintillalexerjava.cpp
  36. +2
    -2
      qt/qextscintillalexerjava.h
  37. +1
    -1
      qt/qextscintillalexerjavascript.cpp
  38. +2
    -2
      qt/qextscintillalexerjavascript.h
  39. +1
    -1
      qt/qextscintillalexerlua.cpp
  40. +2
    -2
      qt/qextscintillalexerlua.h
  41. +1
    -1
      qt/qextscintillalexermakefile.cpp
  42. +2
    -2
      qt/qextscintillalexermakefile.h
  43. +1
    -1
      qt/qextscintillalexerperl.cpp
  44. +2
    -2
      qt/qextscintillalexerperl.h
  45. +1
    -1
      qt/qextscintillalexerpov.cpp
  46. +2
    -2
      qt/qextscintillalexerpov.h
  47. +1
    -1
      qt/qextscintillalexerproperties.cpp
  48. +2
    -2
      qt/qextscintillalexerproperties.h
  49. +1
    -1
      qt/qextscintillalexerpython.cpp
  50. +2
    -2
      qt/qextscintillalexerpython.h
  51. +1
    -1
      qt/qextscintillalexerruby.cpp
  52. +2
    -2
      qt/qextscintillalexerruby.h
  53. +1
    -1
      qt/qextscintillalexersql.cpp
  54. +2
    -2
      qt/qextscintillalexersql.h
  55. +1
    -1
      qt/qextscintillalexertex.cpp
  56. +2
    -2
      qt/qextscintillalexertex.h
  57. +2
    -2
      qt/qextscintillamacro.cpp
  58. +1
    -1
      qt/qextscintillamacro.h
  59. +2
    -2
      qt/qextscintillaprinter.cpp
  60. +2
    -2
      qt/qextscintillaprinter.h
  61. +1
    -1
      qt/qscintilla.pro

+ 1
- 1
designer/qscintillaplugin.cpp View File

@@ -121,7 +121,7 @@ TQIconSet TQScintillaPlugin::iconSet(const TQString &) const
TQString TQScintillaPlugin::includeFile(const TQString &feature) const
{
if (feature == "QextScintilla")
return "tqextscintilla.h";
return "qextscintilla.h";

return TQString();
}


+ 2
- 2
example/application.cpp View File

@@ -29,8 +29,8 @@
#include <tqwhatsthis.h>
#include <tqsimplerichtext.h>

#include <tqextscintilla.h>
#include <tqextscintillaprinter.h>
#include <qextscintilla.h>
#include <qextscintillaprinter.h>

#include "filesave.xpm"
#include "fileopen.xpm"


+ 1
- 1
qt/PlatQt.cpp View File

@@ -40,7 +40,7 @@
#include "Platform.h"
#include "XPM.h"

#include "tqextscintillabase.h"
#include "qextscintillabase.h"


// Type convertors.


+ 1
- 1
qt/ScintillaQt.cpp View File

@@ -29,7 +29,7 @@
#include <tqdragobject.h>
#include <tqpainter.h>

#include "tqextscintillabase.h"
#include "qextscintillabase.h"
#include "ScintillaTQt.h"




+ 4
- 4
qt/qextscintilla.cpp View File

@@ -26,10 +26,10 @@
#include <tqapplication.h>
#include <tqcolor.h>

#include "tqextscintilla.h"
#include "tqextscintillalexer.h"
#include "tqextscintillaapis.h"
#include "tqextscintillacommandset.h"
#include "qextscintilla.h"
#include "qextscintillalexer.h"
#include "qextscintillaapis.h"
#include "qextscintillacommandset.h"


// Make sure these match the values in Scintilla.h. We don't #include that


+ 3
- 3
qt/qextscintilla.h View File

@@ -28,9 +28,9 @@
#include <tqobject.h>
#include <tqguardedptr.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillabase.h>
#include <tqextscintilladocument.h>
#include <qextscintillaglobal.h>
#include <qextscintillabase.h>
#include <qextscintilladocument.h>


class QextScintillaLexer;


+ 1
- 1
qt/qextscintillaapis.cpp View File

@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <tqregexp.h>

#include "tqextscintillaapis.h"
#include "qextscintillaapis.h"


// The ctor.


+ 1
- 1
qt/qextscintillaapis.h View File

@@ -26,7 +26,7 @@

#include <tqstringlist.h>

#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


//! \brief The QextScintillaAPIs class represents the textual API information


+ 1
- 1
qt/qextscintillabase.cpp View File

@@ -30,7 +30,7 @@
#include <tqpainter.h>
#include <tqptrlist.h>

#include "tqextscintillabase.h"
#include "qextscintillabase.h"
#include "ScintillaTQt.h"




+ 1
- 1
qt/qextscintillabase.h View File

@@ -29,7 +29,7 @@
#include <tqtimer.h>
#include <tqwidget.h>

#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


class ScintillaTQt;


+ 3
- 3
qt/qextscintillacommand.cpp View File

@@ -23,9 +23,9 @@
#include <tqnamespace.h>
#include <tqapplication.h>

#include "tqextscintillacommand.h"
#include "tqextscintilla.h"
#include "tqextscintillabase.h"
#include "qextscintillacommand.h"
#include "qextscintilla.h"
#include "qextscintillabase.h"


static int convert(int key);


+ 1
- 1
qt/qextscintillacommand.h View File

@@ -26,7 +26,7 @@

#include <tqstring.h>

#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


class QextScintilla;


+ 3
- 3
qt/qextscintillacommandset.cpp View File

@@ -22,9 +22,9 @@

#include <tqsettings.h>

#include "tqextscintillacommandset.h"
#include "tqextscintillacommand.h"
#include "tqextscintilla.h"
#include "qextscintillacommandset.h"
#include "qextscintillacommand.h"
#include "qextscintilla.h"


// The ctor.


+ 2
- 2
qt/qextscintillacommandset.h View File

@@ -26,8 +26,8 @@

#include <tqptrlist.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillacommand.h>
#include <qextscintillaglobal.h>
#include <qextscintillacommand.h>


class TQSettings;


+ 2
- 2
qt/qextscintilladocument.cpp View File

@@ -20,8 +20,8 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


#include "tqextscintilladocument.h"
#include "tqextscintillabase.h"
#include "qextscintilladocument.h"
#include "qextscintillabase.h"


// This internal class encapsulates the underlying document and is shared by


+ 1
- 1
qt/qextscintilladocument.h View File

@@ -24,7 +24,7 @@
#define TQEXTSCINTILLADOCUMENT_H


#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


class QextScintillaBase;


+ 3
- 3
qt/qextscintillalexer.cpp View File

@@ -25,9 +25,9 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexer.h"
#include "tqextscintilla.h"
#include "tqextscintillabase.h"
#include "qextscintillalexer.h"
#include "qextscintilla.h"
#include "qextscintillabase.h"


// The ctor.


+ 1
- 1
qt/qextscintillalexer.h View File

@@ -29,7 +29,7 @@
#include <tqcolor.h>
#include <tqfont.h>

#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


class TQSettings;


+ 1
- 1
qt/qextscintillalexerbash.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerbash.h"
#include "qextscintillalexerbash.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerbash.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerBash class encapsulates the Scintilla Bash


+ 1
- 1
qt/qextscintillalexerbatch.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerbatch.h"
#include "qextscintillalexerbatch.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerbatch.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerBatch class encapsulates the Scintilla batch


+ 1
- 1
qt/qextscintillalexercpp.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexercpp.h"
#include "qextscintillalexercpp.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexercpp.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerCPP class encapsulates the Scintilla C++


+ 1
- 1
qt/qextscintillalexercsharp.cpp View File

@@ -23,7 +23,7 @@
#include <tqcolor.h>
#include <tqfont.h>

#include "tqextscintillalexercsharp.h"
#include "qextscintillalexercsharp.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexercsharp.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexercpp.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexercpp.h>


//! \brief The QextScintillaLexerCSharp class encapsulates the Scintilla C#


+ 1
- 1
qt/qextscintillalexercss.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexercss.h"
#include "qextscintillalexercss.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexercss.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerCSS class encapsulates the Scintilla CSS


+ 1
- 1
qt/qextscintillalexerdiff.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerdiff.h"
#include "qextscintillalexerdiff.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerdiff.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerDiff class encapsulates the Scintilla Diff


+ 3
- 3
qt/qextscintillalexerhtml.cpp View File

@@ -24,9 +24,9 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerhtml.h"
#include "tqextscintillalexerjavascript.h"
#include "tqextscintillalexerpython.h"
#include "qextscintillalexerhtml.h"
#include "qextscintillalexerjavascript.h"
#include "qextscintillalexerpython.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerhtml.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerHTML class encapsulates the Scintilla HTML


+ 1
- 1
qt/qextscintillalexeridl.cpp View File

@@ -23,7 +23,7 @@
#include <tqcolor.h>
#include <tqfont.h>

#include "tqextscintillalexeridl.h"
#include "qextscintillalexeridl.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexeridl.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexercpp.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexercpp.h>


//! \brief The QextScintillaLexerIDL class encapsulates the Scintilla IDL


+ 1
- 1
qt/qextscintillalexerjava.cpp View File

@@ -20,7 +20,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


#include "tqextscintillalexerjava.h"
#include "qextscintillalexerjava.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerjava.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexercpp.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexercpp.h>


//! \brief The QextScintillaLexerJava class encapsulates the Scintilla Java


+ 1
- 1
qt/qextscintillalexerjavascript.cpp View File

@@ -23,7 +23,7 @@
#include <tqcolor.h>
#include <tqfont.h>

#include "tqextscintillalexerjavascript.h"
#include "qextscintillalexerjavascript.h"


// The list of JavaScript keywords that can be used by other friendly lexers.


+ 2
- 2
qt/qextscintillalexerjavascript.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexercpp.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexercpp.h>


//! \brief The QextScintillaLexerJavaScript class encapsulates the Scintilla


+ 1
- 1
qt/qextscintillalexerlua.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerlua.h"
#include "qextscintillalexerlua.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerlua.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerLua class encapsulates the Scintilla Lua


+ 1
- 1
qt/qextscintillalexermakefile.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexermakefile.h"
#include "qextscintillalexermakefile.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexermakefile.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerMakefile class encapsulates the Scintilla


+ 1
- 1
qt/qextscintillalexerperl.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerperl.h"
#include "qextscintillalexerperl.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerperl.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerPerl class encapsulates the Scintilla Perl


+ 1
- 1
qt/qextscintillalexerpov.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerpov.h"
#include "qextscintillalexerpov.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerpov.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerPOV class encapsulates the Scintilla POV


+ 1
- 1
qt/qextscintillalexerproperties.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerproperties.h"
#include "qextscintillalexerproperties.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerproperties.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerProperties class encapsulates the Scintilla


+ 1
- 1
qt/qextscintillalexerpython.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerpython.h"
#include "qextscintillalexerpython.h"


// The list of Python keywords that can be used by other friendly lexers.


+ 2
- 2
qt/qextscintillalexerpython.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerPython class encapsulates the Scintilla Python


+ 1
- 1
qt/qextscintillalexerruby.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexerruby.h"
#include "qextscintillalexerruby.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexerruby.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerRuby class encapsulates the Scintilla Ruby


+ 1
- 1
qt/qextscintillalexersql.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexersql.h"
#include "qextscintillalexersql.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexersql.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerSQL class encapsulates the Scintilla SQL


+ 1
- 1
qt/qextscintillalexertex.cpp View File

@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqsettings.h>

#include "tqextscintillalexertex.h"
#include "qextscintillalexertex.h"


// The ctor.


+ 2
- 2
qt/qextscintillalexertex.h View File

@@ -26,8 +26,8 @@

#include <tqobject.h>

#include <tqextscintillaglobal.h>
#include <tqextscintillalexer.h>
#include <qextscintillaglobal.h>
#include <qextscintillalexer.h>


//! \brief The QextScintillaLexerTeX class encapsulates the Scintilla TeX


+ 2
- 2
qt/qextscintillamacro.cpp View File

@@ -24,8 +24,8 @@

#include <tqstring.h>

#include "tqextscintillamacro.h"
#include "tqextscintilla.h"
#include "qextscintillamacro.h"
#include "qextscintilla.h"


static TQCString extract(const TQCString &asc,int &start);


+ 1
- 1
qt/qextscintillamacro.h View File

@@ -28,7 +28,7 @@
#include <tqcstring.h>
#include <tqvaluelist.h>

#include <tqextscintillaglobal.h>
#include <qextscintillaglobal.h>


class TQString;


+ 2
- 2
qt/qextscintillaprinter.cpp View File

@@ -25,8 +25,8 @@
#include <tqpaintdevicemetrics.h>
#include <tqvaluestack.h>

#include "tqextscintillaprinter.h"
#include "tqextscintillabase.h"
#include "qextscintillaprinter.h"
#include "qextscintillabase.h"


// The ctor.


+ 2
- 2
qt/qextscintillaprinter.h View File

@@ -26,8 +26,8 @@

#include <tqprinter.h>

#include <tqextscintillaglobal.h>
#include <tqextscintilla.h>
#include <qextscintillaglobal.h>
#include <qextscintilla.h>


class TQRect;


+ 1
- 1
qt/qscintilla.pro View File

@@ -27,7 +27,7 @@ TEMPLATE = lib
TARGET = qscintilla
# DESTDIR = $(QTDIR)/lib
CONFIG += qt warn_off release dll thread
INCLUDEPATH = . ../include ../src
INCLUDEPATH = . ../include ../src /usr/include/tqt
DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER

HEADERS = \


Loading…
Cancel
Save