From 77ad698c4528ee58c7a336ab48100ee2364f2d03 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Tue, 30 Oct 2018 01:13:32 +0100
Subject: [PATCH] Looser coupling between examples and FTerm

---
 examples/term-attributes.cpp | 2 +-
 examples/termcap.cpp         | 3 +--
 examples/ui.cpp              | 6 +++---
 src/include/final/fvterm.h   | 5 +++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/term-attributes.cpp b/examples/term-attributes.cpp
index 30a49f52..2cd7b4cc 100644
--- a/examples/term-attributes.cpp
+++ b/examples/term-attributes.cpp
@@ -74,7 +74,7 @@ AttribDlg::AttribDlg (finalcut::FWidget* parent)
   , back_button("< &Back", this)
 {
   setText ( "A terminal attributes test ("
-          + finalcut::FString(getFTerm().getTermType())
+          + finalcut::FString(getTermType())
           + ")");
 
   next_button.setGeometry(int(getWidth()) - 13, int(getHeight()) - 4, 10, 1);
diff --git a/examples/termcap.cpp b/examples/termcap.cpp
index 665a56d7..f82fd3a1 100644
--- a/examples/termcap.cpp
+++ b/examples/termcap.cpp
@@ -316,9 +316,8 @@ int main (int argc, char* argv[])
   finalcut::FTermcap::tcap_map* tcap = 0;
   tcap = finalcut::FTermcap::getTermcapMap();
 
-  finalcut::FTerm& fterm = TermApp.getFTerm();
   std::cout << "--------\r\nFTermcap\r\n--------\r\n\n";
-  std::cout << "Terminal: " << fterm.getTermType() << "\r\n";
+  std::cout << "Terminal: " << TermApp.getTermType() << "\r\n";
 
   debug (TermApp);
 
diff --git a/examples/ui.cpp b/examples/ui.cpp
index 73eae1e9..7566c9dd 100644
--- a/examples/ui.cpp
+++ b/examples/ui.cpp
@@ -836,8 +836,8 @@ void MyDialog::cb_terminfo (finalcut::FWidget*, data_ptr)
   (
     "Environment"
     , finalcut::FString()
-      << "  Type: " << getFTerm().getTermType() << "\n"
-      << "  Name: " << getFTerm().getTermFileName() << "\n"
+      << "  Type: " << getTermType() << "\n"
+      << "  Name: " << getTermFileName() << "\n"
       << "  Mode: " << getEncodingString() << "\n"
       << "  Size: " << x << wchar_t(finalcut::fc::Times)
                     << y << "\n"
@@ -943,7 +943,7 @@ void MyDialog::cb_setTitlebar (finalcut::FWidget* widget, data_ptr)
   finalcut::FLineEdit* lineedit = static_cast<finalcut::FLineEdit*>(widget);
   finalcut::FString title;
   *lineedit >> title;
-  getFTerm().setTermTitle (title);
+  setTermTitle (title);
   setText (title);
   redraw();
 }
diff --git a/src/include/final/fvterm.h b/src/include/final/fvterm.h
index 75afa247..b7ebce7e 100644
--- a/src/include/final/fvterm.h
+++ b/src/include/final/fvterm.h
@@ -140,6 +140,7 @@ class FVTerm
     static std::string    getEncodingString();
     static const FString  getKeyName (int);
     static char*          getTermType();
+    static char*          getTermFileName();
     FTerm&                getFTerm();
 
     // Mutators
@@ -635,6 +636,10 @@ inline const FString FVTerm::getKeyName (int keynum)
 inline char* FVTerm::getTermType()
 { return FTerm::getTermType(); }
 
+//----------------------------------------------------------------------
+inline char* FVTerm::getTermFileName()
+{ return FTerm::getTermFileName(); }
+
 //----------------------------------------------------------------------
 inline FTerm& FVTerm::getFTerm()
 { return *fterm; }