diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-11-16 23:46:08 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-11-17 03:56:42 +0100 |
| commit | 2542eb02648294256a01ae4ecb6ac81bc8ab5094 (patch) | |
| tree | 81166dbe78031f7764ca2d6d4925d96283ac29c5 /src/main.cpp | |
| parent | e762a43754ba375789fa749ca2e00a3548500d6a (diff) | |
| download | sciteco-2542eb02648294256a01ae4ecb6ac81bc8ab5094.tar.gz | |
Make sure QRegister::view is properly initialized and cleaned up
* it must be initialized after the UI (Interface::main), so I added
a View::initialize() function
* the old initialize() method was renamed to setup()
* use a global instance of QRegister::view so it is guaranteed to
be destroyed only after any QRegisters that could still need it
* Document API adapted to work with ViewCurrent references
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index a713964..5697063 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,6 +53,7 @@ namespace SciTECO { * GCC init_priority() attribute */ InterfaceCurrent interface; +ViewCurrent QRegisters::view; /* * Scintilla will be initialized after these @@ -288,10 +289,9 @@ main(int argc, char **argv) /* * QRegister view must be initialized only now - * (after Curses initialization) + * (e.g. after Curses/GTK initialization). */ - QRegisters::view = new ViewCurrent(); - // FIXME: view should be deallocated */ + QRegisters::view.initialize(); /* search string and status register */ QRegisters::globals.insert("_"); |