perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some code formatting

This commit is contained in:
Markus Gans 2018-10-24 00:16:45 +02:00
parent 3678d52766
commit e359d16417
41 changed files with 1746 additions and 1270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2520
m4/libtool.m4 vendored
View File

File diff suppressed because it is too large Load Diff

127
m4/ltoptions.m4 vendored
View File

@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 7 ltoptions.m4
# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
[m4_warning([Unknown $1 option `$2'])])[]dnl
[m4_warning([Unknown $1 option '$2'])])[]dnl
])
@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
dnl `shared' nor `disable-shared' was passed, we enable building of shared
dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
[_LT_ENABLE_FAST_INSTALL])
[_LT_ENABLE_FAST_INSTALL])
_LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
[_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `dlopen' option into LT_INIT's first parameter.])
put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `win32-dll' option into LT_INIT's first parameter.])
put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
# implement the --enable-shared flag, and supports the `shared' and
# `disable-shared' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-shared flag, and supports the 'shared' and
# 'disable-shared' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
# implement the --enable-static flag, and support the `static' and
# `disable-static' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-static flag, and support the 'static' and
# 'disable-static' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
# implement the --enable-fast-install flag, and support the `fast-install'
# and `disable-fast-install' LT_INIT options.
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
# implement the --enable-fast-install flag, and support the 'fast-install'
# and 'disable-fast-install' LT_INIT options.
# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `fast-install' option into LT_INIT's first parameter.])
the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `disable-fast-install' option into LT_INIT's first parameter.])
the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
# _LT_WITH_AIX_SONAME([DEFAULT])
# ----------------------------------
# implement the --with-aix-soname flag, and support the `aix-soname=aix'
# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
m4_define([_LT_WITH_AIX_SONAME],
[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
shared_archive_member_spec=
case $host,$enable_shared in
power*-*-aix[[5-9]]*,yes)
AC_MSG_CHECKING([which variant of shared library versioning to provide])
AC_ARG_WITH([aix-soname],
[AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
[shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
[case $withval in
aix|svr4|both)
;;
*)
AC_MSG_ERROR([Unknown argument to --with-aix-soname])
;;
esac
lt_cv_with_aix_soname=$with_aix_soname],
[AC_CACHE_VAL([lt_cv_with_aix_soname],
[lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
with_aix_soname=$lt_cv_with_aix_soname])
AC_MSG_RESULT([$with_aix_soname])
if test aix != "$with_aix_soname"; then
# For the AIX way of multilib, we name the shared archive member
# based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
# and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
# Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
# the AIX toolchain works better with OBJECT_MODE set (default 32).
if test 64 = "${OBJECT_MODE-32}"; then
shared_archive_member_spec=shr_64
else
shared_archive_member_spec=shr
fi
fi
;;
*)
with_aix_soname=aix
;;
esac
_LT_DECL([], [shared_archive_member_spec], [0],
[Shared archive member basename, for filename based shared library versioning on AIX])dnl
])# _LT_WITH_AIX_SONAME
LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
# _LT_WITH_PIC([MODE])
# --------------------
# implement the --with-pic flag, and support the `pic-only' and `no-pic'
# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
IFS="$lt_save_ifs"
IFS=$lt_save_ifs
;;
esac],
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
[pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `pic-only' option into LT_INIT's first parameter.])
put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:

7
m4/ltsugar.m4 vendored
View File

@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
# Autoconf-2.59 which quotes differently.
# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different

12
m4/ltversion.m4 vendored
View File

@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
# Copyright (C) 2004 Free Software Foundation, Inc.
# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@ -9,15 +9,15 @@
# @configure_input@
# serial 3337 ltversion.m4
# serial 4179 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.4.2])
m4_define([LT_PACKAGE_REVISION], [1.3337])
m4_define([LT_PACKAGE_VERSION], [2.4.6])
m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.4.2'
macro_revision='1.3337'
[macro_version='2.4.6'
macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])

5
m4/lt~obsolete.m4 vendored
View File

@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#

2
src/fapplication.cpp
View File

@ -63,7 +63,7 @@ FApplication::eventQueue* FApplication::event_queue = 0;
FApplication::FApplication ( const int& _argc
, char* _argv[]
, bool disable_alt_screen )
: FWidget(processParameters(_argc,_argv), disable_alt_screen)
: FWidget(processParameters(_argc, _argv), disable_alt_screen)
, app_argc(_argc)
, app_argv(_argv)
, key_timeout(100000) // 100 ms

4
src/flistview.cpp
View File

@ -693,7 +693,9 @@ fc::sorting_type FListView::getColumnSortType (int column) const
}
//----------------------------------------------------------------------
void FListView::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FListView::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Set the widget geometry

3
src/fterm.cpp
View File

@ -471,7 +471,7 @@ void FTerm::detectTermSize()
if ( ret != 0 || win_size.ws_col == 0 || win_size.ws_row == 0 )
{
char* str;
term_geometry.setPos(1,1);
term_geometry.setPos (1, 1);
// Use COLUMNS or fallback to the xterm default width of 80 characters
str = std::getenv("COLUMNS");
term_geometry.setWidth(str ? std::size_t(std::atoi(str)) : 80);
@ -1681,7 +1681,6 @@ inline void FTerm::allocationValues()
//----------------------------------------------------------------------
inline void FTerm::deallocationValues()
{
#if defined(__NetBSD__) || defined(__OpenBSD__)
if ( openbsd )
delete openbsd;

5
src/ftermdetection.cpp
View File

@ -453,8 +453,9 @@ char* FTermDetection::termtype_256color_quirks()
if ( color_env.string3 && std::strlen(color_env.string3) > 0 )
decscusr_support = true;
if ( (color_env.string1 && std::strncmp(color_env.string1, "gnome-terminal", 14) == 0)
|| color_env.string2 )
if ( color_env.string2
|| (color_env.string1
&& std::strncmp(color_env.string1, "gnome-terminal", 14) == 0) )
{
terminal_type.gnome_terminal = true;
// Each gnome-terminal should be able to use 256 colors

4
src/ftextview.cpp
View File

@ -93,7 +93,9 @@ const FString FTextView::getText() const
}
//----------------------------------------------------------------------
void FTextView::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FTextView::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Set the text view geometry

4
src/fwidget.cpp
View File

@ -604,7 +604,9 @@ void FWidget::setTermSize (std::size_t w, std::size_t h)
}
//----------------------------------------------------------------------
void FWidget::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FWidget::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Sets the geometry of the widget relative to its parent

4
src/fwindow.cpp
View File

@ -408,7 +408,9 @@ void FWindow::setSize (std::size_t w, std::size_t h, bool adjust)
}
//----------------------------------------------------------------------
void FWindow::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FWindow::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Sets the geometry of the widget

2
src/include/final/fbuttongroup.h
View File

@ -73,7 +73,7 @@ class FButtonGroup : public FScrollView
public:
// Constructors
explicit FButtonGroup (FWidget* = 0);
FButtonGroup (const FString&, FWidget* = 0);
explicit FButtonGroup (const FString&, FWidget* = 0);
// Destructor
virtual ~FButtonGroup();

2
src/include/final/fcheckbox.h
View File

@ -74,7 +74,7 @@ class FCheckBox : public FToggleButton
public:
// Constructors
explicit FCheckBox (FWidget* = 0);
FCheckBox (const FString&, FWidget* = 0);
explicit FCheckBox (const FString&, FWidget* = 0);
// Destructor
virtual ~FCheckBox();

2
src/include/final/fcheckmenuitem.h
View File

@ -74,7 +74,7 @@ class FCheckMenuItem : public FMenuItem
public:
// Constructors
explicit FCheckMenuItem (FWidget* = 0);
FCheckMenuItem (const FString&, FWidget* = 0);
explicit FCheckMenuItem (const FString&, FWidget* = 0);
// Destructor
virtual ~FCheckMenuItem();

2
src/include/final/fcolorpalette.h
View File

@ -51,7 +51,7 @@ class FColorPalette
{
public:
// Constructor
explicit FColorPalette();
FColorPalette();
// Destructor
virtual ~FColorPalette();

3
src/include/final/fconfig.h
View File

@ -161,8 +161,7 @@
#define F_HAVE_VSNPRINTF 1
#endif
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#ifndef F_LT_OBJDIR
#define F_LT_OBJDIR ".libs/"
#endif

2
src/include/final/fdialoglistmenu.h
View File

@ -80,7 +80,7 @@ class FDialogListMenu : public FMenu
public:
// Constructors
explicit FDialogListMenu (FWidget* = 0);
FDialogListMenu (const FString&, FWidget* = 0);
explicit FDialogListMenu (const FString&, FWidget* = 0);
// Destructor
virtual ~FDialogListMenu();

2
src/include/final/fkeyboard.h
View File

@ -60,7 +60,7 @@ class FKeyboardCommand
{
public:
// Constructor
FKeyboardCommand (FApplication* = 0, void(FApplication::*)() = 0);
explicit FKeyboardCommand (FApplication* = 0, void(FApplication::*)() = 0);
// Method
void execute();

2
src/include/final/flabel.h
View File

@ -74,7 +74,7 @@ class FLabel : public FWidget
// Constructor
explicit FLabel (FWidget* = 0);
FLabel (const FString&, FWidget* = 0);
explicit FLabel (const FString&, FWidget* = 0);
// Destructor
virtual ~FLabel();

2
src/include/final/flineedit.h
View File

@ -77,7 +77,7 @@ class FLineEdit : public FWidget
// Constructor
explicit FLineEdit (FWidget* = 0);
FLineEdit (const FString&, FWidget* = 0);
explicit FLineEdit (const FString&, FWidget* = 0);
// Destructor
virtual ~FLineEdit();

3
src/include/final/flistbox.h
View File

@ -526,7 +526,8 @@ void FListBox::insert (Container container, LazyConverter convert)
}
//----------------------------------------------------------------------
inline FListBox::listBoxItems::iterator FListBox::index2iterator (std::size_t index)
inline FListBox::listBoxItems::iterator \
FListBox::index2iterator (std::size_t index)
{
listBoxItems::iterator iter = itemlist.begin();
std::advance (iter, index);

13
src/include/final/flistview.h
View File

@ -52,6 +52,7 @@
#error "Only <final/final.h> can be included directly."
#endif
#include <list>
#include <stack>
#include <vector>
@ -179,7 +180,7 @@ class FListViewIterator
typedef std::stack<FObjectIterator> FObjectIteratorStack;
// Constructor
explicit FListViewIterator ();
FListViewIterator ();
FListViewIterator (FObjectIterator);
// Overloaded operators
@ -269,11 +270,13 @@ class FListView : public FWidget
FListViewItem* getCurrentItem();
// Mutators
virtual void setGeometry (int, int, std::size_t, std::size_t, bool = true);
virtual void setGeometry ( int, int
, std::size_t, std::size_t
, bool = true );
void setColumnAlignment (int, fc::text_alignment);
void setColumnText (int, const FString&);
void setColumnSortType (int,fc::sorting_type \
= fc::by_name);
void setColumnSortType (int, fc::sorting_type \
= fc::by_name);
void setColumnSort (int, fc::sorting_order \
= fc::ascending);
template <typename Compare>
@ -432,7 +435,7 @@ class FListView : public FWidget
struct FListView::Header
{
public:
explicit Header()
Header()
: name()
, width (0)
, fixed_width (false)

2
src/include/final/fmenu.h
View File

@ -79,7 +79,7 @@ class FMenu : public FWindow, public FMenuList
public:
// Constructor
explicit FMenu (FWidget* = 0);
FMenu (const FString&, FWidget* = 0);
explicit FMenu (const FString&, FWidget* = 0);
// Destructor
virtual ~FMenu();

2
src/include/final/fmenuitem.h
View File

@ -83,7 +83,7 @@ class FMenuItem : public FWidget
// Constructor
explicit FMenuItem (FWidget* = 0);
FMenuItem (const FString&, FWidget* = 0);
explicit FMenuItem (const FString&, FWidget* = 0);
FMenuItem (int, const FString&, FWidget* = 0);
// Destructor

2
src/include/final/fmenulist.h
View File

@ -62,7 +62,7 @@ class FMenuList
{
public:
// Constructor
explicit FMenuList();
FMenuList();
// Destructor
virtual ~FMenuList();

2
src/include/final/foptiattr.h
View File

@ -156,7 +156,7 @@ class FOptiAttr
} termEnv;
// Constructor
explicit FOptiAttr();
FOptiAttr();
// Destructor
virtual ~FOptiAttr();

4
src/include/final/fradiobutton.h
View File

@ -3,7 +3,7 @@
* *
* This file is part of the Final Cut widget toolkit *
* *
* Copyright 2014-2017 Markus Gans *
* Copyright 2014-2018 Markus Gans *
* *
* The Final Cut is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public License *
@ -74,7 +74,7 @@ class FRadioButton : public FToggleButton
public:
// Constructors
explicit FRadioButton (FWidget* = 0);
FRadioButton (const FString&, FWidget* = 0);
explicit FRadioButton (const FString&, FWidget* = 0);
// Destructor
virtual ~FRadioButton();

4
src/include/final/fradiomenuitem.h
View File

@ -3,7 +3,7 @@
* *
* This file is part of the Final Cut widget toolkit *
* *
* Copyright 2015-2017 Markus Gans *
* Copyright 2015-2018 Markus Gans *
* *
* The Final Cut is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public License *
@ -74,7 +74,7 @@ class FRadioMenuItem : public FMenuItem
public:
// Constructors
explicit FRadioMenuItem (FWidget* = 0);
FRadioMenuItem (const FString&, FWidget* = 0);
explicit FRadioMenuItem (const FString&, FWidget* = 0);
// Destructor
virtual ~FRadioMenuItem();

4
src/include/final/fscrollbar.h
View File

@ -84,8 +84,8 @@ class FScrollbar : public FWidget
};
// Constructors
explicit FScrollbar(FWidget* = 0);
FScrollbar (int = fc::vertical, FWidget* = 0);
explicit FScrollbar (FWidget* = 0);
explicit FScrollbar (int = fc::vertical, FWidget* = 0);
// Destructor
virtual ~FScrollbar();

4
src/include/final/fscrollview.h
View File

@ -100,7 +100,9 @@ class FScrollView : public FWidget
virtual void setWidth (std::size_t, bool = true);
virtual void setHeight (std::size_t, bool = true);
virtual void setSize (std::size_t, std::size_t, bool = true);
virtual void setGeometry (int, int, std::size_t, std::size_t, bool = true);
virtual void setGeometry ( int, int
, std::size_t, std::size_t
, bool = true );
void setCursorPos (int, int);
void setPrintPos (int, int);
bool setViewportPrint (bool);

24
src/include/final/fstring.h
View File

@ -141,22 +141,22 @@ class FString
bool operator < (const FString&) const;
template <typename CharT>
bool operator < (CharT&) const;
bool operator < (const CharT&) const;
bool operator <= (const FString&) const;
template <typename CharT>
bool operator <= (CharT&) const;
bool operator <= (const CharT&) const;
bool operator == (const FString&) const;
template <typename CharT>
bool operator == (CharT&) const;
bool operator == (const CharT&) const;
bool operator != (const FString&) const;
template <typename CharT>
bool operator != (CharT&) const;
bool operator != (const CharT&) const;
bool operator >= (const FString&) const;
template <typename CharT>
bool operator >= (CharT&) const;
bool operator >= (const CharT&) const;
bool operator > (const FString&) const;
template <typename CharT>
bool operator > (CharT&) const;
bool operator > (const CharT&) const;
operator const char* () const { return c_str(); }
@ -309,7 +309,7 @@ inline const wchar_t& FString::operator [] (IndexT pos) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator < (CharT& s) const
inline bool FString::operator < (const CharT& s) const
{
const FString tmp(s);
return *this < tmp;
@ -317,7 +317,7 @@ inline bool FString::operator < (CharT& s) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator <= (CharT& s) const
inline bool FString::operator <= (const CharT& s) const
{
const FString tmp(s);
return *this <= tmp;
@ -325,7 +325,7 @@ inline bool FString::operator <= (CharT& s) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator == (CharT& s) const
inline bool FString::operator == (const CharT& s) const
{
const FString tmp(s);
return *this == tmp;
@ -333,7 +333,7 @@ inline bool FString::operator == (CharT& s) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator != (CharT& s) const
inline bool FString::operator != (const CharT& s) const
{
const FString tmp(s);
return *this != tmp;
@ -341,7 +341,7 @@ inline bool FString::operator != (CharT& s) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator >= (CharT& s) const
inline bool FString::operator >= (const CharT& s) const
{
const FString tmp(s);
return *this >= tmp;
@ -349,7 +349,7 @@ inline bool FString::operator >= (CharT& s) const
//----------------------------------------------------------------------
template <typename CharT>
inline bool FString::operator > (CharT& s) const
inline bool FString::operator > (const CharT& s) const
{
const FString tmp(s);
return *this > tmp;

2
src/include/final/fswitch.h
View File

@ -74,7 +74,7 @@ class FSwitch : public FToggleButton
public:
// Constructors
explicit FSwitch (FWidget* = 0);
FSwitch (const FString&, FWidget* = 0);
explicit FSwitch (const FString&, FWidget* = 0);
// Destructor
virtual ~FSwitch();

2
src/include/final/ftermbuffer.h
View File

@ -59,7 +59,7 @@ class FTermBuffer
typedef FOptiAttr::charData charData;
// Constructor
explicit FTermBuffer();
FTermBuffer();
// Destructor
virtual ~FTermBuffer();

3
src/include/final/ftermdata.h
View File

@ -36,6 +36,7 @@
#endif
#include <map>
#include <string>
#include "final/fc.h"
#include "final/frect.h"
@ -56,7 +57,7 @@ class FTermData
{
public:
// Typedefs
typedef std::map<std::string,fc::encoding> encodingMap;
typedef std::map<std::string, fc::encoding> encodingMap;
// Constructors
FTermData();

4
src/include/final/ftextview.h
View File

@ -90,7 +90,9 @@ class FTextView : public FWidget
const FStringList& getLines() const;
// Mutators
virtual void setGeometry (int, int, std::size_t, std::size_t, bool = true);
virtual void setGeometry ( int, int
, std::size_t, std::size_t
, bool = true );
void setText (const FString&);
void scrollToX (int);
void scrollToY (int);

2
src/include/final/ftogglebutton.h
View File

@ -75,7 +75,7 @@ class FToggleButton : public FWidget
// Constructors
explicit FToggleButton (FWidget* = 0);
FToggleButton (const FString&, FWidget* = 0);
explicit FToggleButton (const FString&, FWidget* = 0);
// Destructor
virtual ~FToggleButton();

6
src/include/final/ftypes.h
View File

@ -30,6 +30,8 @@
#include <stdint.h>
#include <sys/types.h>
#include <string>
#define null NULL
namespace
@ -52,7 +54,7 @@ typedef int64_t sInt64;
typedef long double lDouble;
} // namespace
} // namespace
namespace finalcut
@ -87,7 +89,7 @@ keyname;
} // namespace fc
} // namespace finalcut
} // namespace finalcut
#endif // FTYPES_H

13
src/include/final/fvterm.h
View File

@ -52,7 +52,10 @@
#include "final/fconfig.h" // includes _GNU_SOURCE for wcwidth()
#endif
#include <queue>
#include <sstream> // std::stringstream
#include <string>
#include <vector>
#include "final/fterm.h"
@ -285,8 +288,11 @@ class FVTerm : public FTerm
static void restoreVTerm (const FRect&);
static void restoreVTerm (int, int, int, int);
static void setTextToDefault (term_area*, int, int);
static bool reallocateTextArea (term_area*, std::size_t, std::size_t);
static bool reallocateTextArea (term_area*, std::size_t);
static bool reallocateTextArea ( term_area*
, std::size_t
, std::size_t );
static bool reallocateTextArea ( term_area*
, std::size_t );
static covered_state isCovered ( const FPoint&
, term_area* );
@ -514,7 +520,8 @@ inline FVTerm& FVTerm::operator << (const type& s)
}
//----------------------------------------------------------------------
inline FVTerm& FVTerm::operator << (const std::vector<FVTerm::charData>& termString)
inline FVTerm& FVTerm::operator << \
(const std::vector<FVTerm::charData>& termString)
{
print (termString);
return *this;

10
src/include/final/fwidget.h
View File

@ -236,7 +236,9 @@ class FWidget : public FVTerm, public FObject
void setTermOffsetWithPadding();
void setTermSize (std::size_t, std::size_t);
virtual void setGeometry (const FRect&, bool = true);
virtual void setGeometry (int, int, std::size_t, std::size_t, bool = true);
virtual void setGeometry ( int, int
, std::size_t, std::size_t
, bool = true );
virtual void setShadowSize (int, int);
void setMinimumWidth (std::size_t);
void setMinimumHeight (std::size_t);
@ -813,7 +815,8 @@ inline void FWidget::setMinimumHeight (std::size_t min_height)
{ size_hints.setMinimum (size_hints.min_width, min_height); }
//----------------------------------------------------------------------
inline void FWidget::setMinimumSize (std::size_t min_width, std::size_t min_height)
inline void FWidget::setMinimumSize ( std::size_t min_width
, std::size_t min_height )
{ size_hints.setMinimum (min_width, min_height); }
//----------------------------------------------------------------------
@ -825,7 +828,8 @@ inline void FWidget::setMaximumHeight (std::size_t max_height)
{ size_hints.setMaximum (size_hints.max_width, max_height); }
//----------------------------------------------------------------------
inline void FWidget::setMaximumSize (std::size_t max_width, std::size_t max_height)
inline void FWidget::setMaximumSize ( std::size_t max_width
, std::size_t max_height )
{ size_hints.setMaximum (max_width, max_height); }
//----------------------------------------------------------------------

190
src/include/final/fwindow.h
View File

@ -74,113 +74,115 @@ namespace finalcut
class FWindow : public FWidget
{
public:
// Using-declaration
using FWidget::drawBorder;
using FWidget::setPos;
using FWidget::setGeometry;
using FWidget::move;
public:
// Using-declaration
using FWidget::drawBorder;
using FWidget::setPos;
using FWidget::setGeometry;
using FWidget::move;
// Constructor
explicit FWindow (FWidget* = 0);
// Constructor
explicit FWindow (FWidget* = 0);
// Destructor
virtual ~FWindow ();
// Destructor
virtual ~FWindow ();
// Accessors
const char* getClassName() const;
static FWindow* getWindowWidget (const FWidget*);
static int getWindowLayer (const FWidget*);
FWidget* getWindowFocusWidget() const;
// Accessors
const char* getClassName() const;
static FWindow* getWindowWidget (const FWidget*);
static int getWindowLayer (const FWidget*);
FWidget* getWindowFocusWidget() const;
// Mutators
bool setWindowWidget (bool);
bool setWindowWidget();
bool unsetWindowWidget();
static void setActiveWindow (FWindow*);
void setWindowFocusWidget (const FWidget*);
bool activateWindow (bool);
bool activateWindow();
void unsetActiveWindow();
bool deactivateWindow();
virtual bool setResizeable (bool);
virtual bool setResizeable();
bool unsetResizeable();
bool setTransparentShadow (bool);
bool setTransparentShadow();
bool unsetTransparentShadow();
bool setShadow (bool);
bool setShadow();
bool unsetShadow();
bool setAlwaysOnTop (bool);
bool setAlwaysOnTop();
bool unsetAlwaysOnTop();
// Mutators
bool setWindowWidget (bool);
bool setWindowWidget();
bool unsetWindowWidget();
static void setActiveWindow (FWindow*);
void setWindowFocusWidget (const FWidget*);
bool activateWindow (bool);
bool activateWindow();
void unsetActiveWindow();
bool deactivateWindow();
virtual bool setResizeable (bool);
virtual bool setResizeable();
bool unsetResizeable();
bool setTransparentShadow (bool);
bool setTransparentShadow();
bool unsetTransparentShadow();
bool setShadow (bool);
bool setShadow();
bool unsetShadow();
bool setAlwaysOnTop (bool);
bool setAlwaysOnTop();
bool unsetAlwaysOnTop();
// Inquiries
bool isZoomed() const;
bool isWindowActive() const;
bool isWindowHidden() const;
bool isResizeable() const;
bool isAlwaysOnTop() const;
bool hasTransparentShadow() const;
bool hasShadow() const;
// Inquiries
bool isZoomed() const;
bool isWindowActive() const;
bool isWindowHidden() const;
bool isResizeable() const;
bool isAlwaysOnTop() const;
bool hasTransparentShadow() const;
bool hasShadow() const;
// Methods
virtual void drawBorder();
virtual void show();
virtual void hide();
virtual void setX (int, bool = true);
virtual void setY (int, bool = true);
virtual void setPos (int, int, bool = true);
virtual void setWidth (std::size_t, bool = true);
virtual void setHeight (std::size_t, bool = true);
virtual void setSize (std::size_t, std::size_t, bool = true);
void setGeometry (int, int, std::size_t, std::size_t, bool = true);
virtual void move (int, int);
static FWindow* getWindowWidgetAt (const FPoint&);
static FWindow* getWindowWidgetAt (int, int);
static void addWindow (FWidget*);
static void delWindow (FWidget*);
static void swapWindow (FWidget*, FWidget*);
static bool raiseWindow (FWidget*);
bool raiseWindow ();
static bool lowerWindow (FWidget*);
bool lowerWindow ();
bool zoomWindow ();
static void switchToPrevWindow();
static bool activatePrevWindow();
virtual void setShadowSize (int, int);
// Methods
virtual void drawBorder();
virtual void show();
virtual void hide();
virtual void setX (int, bool = true);
virtual void setY (int, bool = true);
virtual void setPos (int, int, bool = true);
virtual void setWidth (std::size_t, bool = true);
virtual void setHeight (std::size_t, bool = true);
virtual void setSize (std::size_t, std::size_t, bool = true);
void setGeometry ( int, int
, std::size_t, std::size_t
, bool = true );
virtual void move (int, int);
static FWindow* getWindowWidgetAt (const FPoint&);
static FWindow* getWindowWidgetAt (int, int);
static void addWindow (FWidget*);
static void delWindow (FWidget*);
static void swapWindow (FWidget*, FWidget*);
static bool raiseWindow (FWidget*);
bool raiseWindow ();
static bool lowerWindow (FWidget*);
bool lowerWindow ();
bool zoomWindow ();
static void switchToPrevWindow();
static bool activatePrevWindow();
virtual void setShadowSize (int, int);
protected:
// Method
virtual void adjustSize();
protected:
// Method
virtual void adjustSize();
// Event handlers
virtual bool event (FEvent*);
virtual void onWindowActive (FEvent*);
virtual void onWindowInactive (FEvent*);
virtual void onWindowRaised (FEvent*);
virtual void onWindowLowered (FEvent*);
// Event handlers
virtual bool event (FEvent*);
virtual void onWindowActive (FEvent*);
virtual void onWindowInactive (FEvent*);
virtual void onWindowRaised (FEvent*);
virtual void onWindowLowered (FEvent*);
// Data Members
static FWindow* previous_window;
// Data Members
static FWindow* previous_window;
private:
// Disable copy constructor
FWindow (const FWindow&);
private:
// Disable copy constructor
FWindow (const FWindow&);
// Disable assignment operator (=)
FWindow& operator = (const FWindow&);
// Disable assignment operator (=)
FWindow& operator = (const FWindow&);
// Methods
static void deleteFromAlwaysOnTopList (FWidget*);
static void processAlwaysOnTop();
// Methods
static void deleteFromAlwaysOnTopList (FWidget*);
static void processAlwaysOnTop();
// Data Members
bool window_active;
bool zoomed;
FWidget* win_focus_widget;
FRect normalGeometry;
// Data Members
bool window_active;
bool zoomed;
FWidget* win_focus_widget;
FRect normalGeometry;
};
#pragma pack(pop)