Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor fixes and cleanup

* If the --enable-debug configure option is used then define DEBUG for all
  compilers (was only for GCC).
* Use accessor functions in BuddyListNode when possible.
* Hide the request test in non-debug builds.
* Make all options in the modelines long.
* Indentation fixes in the tests.
  • Loading branch information...
commit a4e5ce6d72dbb96dd4becdece62e4ae02dae4365 1 parent b66b785
Petr Pavlu authored
Showing with 479 additions and 516 deletions.
  1. +4 −2 configure.ac
  2. +1 −1  cppconsui/AbstractDialog.cpp
  3. +1 −1  cppconsui/AbstractDialog.h
  4. +1 −1  cppconsui/AbstractLine.cpp
  5. +1 −1  cppconsui/AbstractLine.h
  6. +1 −1  cppconsui/AbstractListBox.cpp
  7. +1 −1  cppconsui/AbstractListBox.h
  8. +1 −1  cppconsui/Button.cpp
  9. +3 −3 cppconsui/Button.h
  10. +1 −1  cppconsui/CheckBox.cpp
  11. +1 −1  cppconsui/CheckBox.h
  12. +1 −1  cppconsui/ColorPicker.cpp
  13. +1 −1  cppconsui/ColorPicker.h
  14. +1 −1  cppconsui/ColorPickerComboBox.cpp
  15. +1 −1  cppconsui/ColorPickerComboBox.h
  16. +1 −1  cppconsui/ColorPickerDialog.cpp
  17. +1 −1  cppconsui/ColorPickerDialog.h
  18. +1 −1  cppconsui/ColorPickerPalette.cpp
  19. +1 −1  cppconsui/ColorPickerPalette.h
  20. +1 −1  cppconsui/ColorScheme.cpp
  21. +1 −1  cppconsui/ColorScheme.h
  22. +1 −1  cppconsui/ComboBox.cpp
  23. +2 −2 cppconsui/ComboBox.h
  24. +1 −1  cppconsui/ConsuiCurses.cpp
  25. +1 −1  cppconsui/ConsuiCurses.h
  26. +1 −1  cppconsui/Container.cpp
  27. +1 −1  cppconsui/Container.h
  28. +1 −1  cppconsui/CoreManager.cpp
  29. +1 −1  cppconsui/CoreManager.h
  30. +1 −1  cppconsui/CppConsUI.h
  31. +1 −1  cppconsui/Dialog.cpp
  32. +1 −1  cppconsui/Dialog.h
  33. +1 −1  cppconsui/FreeWindow.cpp
  34. +1 −1  cppconsui/FreeWindow.h
  35. +1 −1  cppconsui/HorizontalLine.cpp
  36. +1 −1  cppconsui/HorizontalLine.h
  37. +1 −1  cppconsui/HorizontalListBox.cpp
  38. +1 −1  cppconsui/HorizontalListBox.h
  39. +1 −1  cppconsui/InputDialog.cpp
  40. +1 −1  cppconsui/InputDialog.h
  41. +1 −1  cppconsui/InputProcessor.cpp
  42. +1 −1  cppconsui/InputProcessor.h
  43. +1 −1  cppconsui/KeyConfig.cpp
  44. +1 −1  cppconsui/KeyConfig.h
  45. +1 −1  cppconsui/Keys.cpp
  46. +1 −1  cppconsui/Keys.h
  47. +1 −1  cppconsui/Label.cpp
  48. +1 −1  cppconsui/Label.h
  49. +1 −1  cppconsui/ListBox.cpp
  50. +1 −1  cppconsui/ListBox.h
  51. +1 −1  cppconsui/MenuWindow.cpp
  52. +1 −1  cppconsui/MenuWindow.h
  53. +1 −1  cppconsui/MessageDialog.cpp
  54. +1 −1  cppconsui/MessageDialog.h
  55. +1 −1  cppconsui/Panel.cpp
  56. +1 −1  cppconsui/Panel.h
  57. +1 −1  cppconsui/ScrollPane.cpp
  58. +1 −1  cppconsui/ScrollPane.h
  59. +1 −1  cppconsui/Spacer.cpp
  60. +1 −1  cppconsui/Spacer.h
  61. +1 −1  cppconsui/SplitDialog.cpp
  62. +1 −1  cppconsui/SplitDialog.h
  63. +1 −1  cppconsui/TextEdit.cpp
  64. +2 −2 cppconsui/TextEdit.h
  65. +1 −1  cppconsui/TextEntry.cpp
  66. +1 −1  cppconsui/TextEntry.h
  67. +1 −1  cppconsui/TextView.cpp
  68. +1 −1  cppconsui/TextView.h
  69. +1 −1  cppconsui/TreeView.cpp
  70. +1 −1  cppconsui/TreeView.h
  71. +1 −1  cppconsui/VerticalLine.cpp
  72. +1 −1  cppconsui/VerticalLine.h
  73. +1 −1  cppconsui/Widget.cpp
  74. +1 −1  cppconsui/Widget.h
  75. +1 −1  cppconsui/Window.cpp
  76. +1 −1  cppconsui/Window.h
  77. +1 −1  src/AccountStatusMenu.cpp
  78. +1 −1  src/AccountStatusMenu.h
  79. +1 −1  src/AccountWindow.cpp
  80. +1 −1  src/AccountWindow.h
  81. +1 −1  src/Accounts.cpp
  82. +1 −1  src/Accounts.h
  83. +1 −1  src/BuddyList.cpp
  84. +1 −1  src/BuddyList.h
  85. +23 −18 src/BuddyListNode.cpp
  86. +1 −1  src/BuddyListNode.h
  87. +1 −1  src/CenterIM.cpp
  88. +1 −1  src/CenterIM.h
  89. +1 −1  src/CenterMain.cpp
  90. +1 −1  src/Connections.cpp
  91. +1 −1  src/Connections.h
  92. +1 −1  src/Conversation.cpp
  93. +1 −1  src/Conversation.h
  94. +1 −1  src/Conversations.cpp
  95. +1 −1  src/Conversations.h
  96. +1 −1  src/Footer.cpp
  97. +1 −1  src/Footer.h
  98. +5 −27 src/GeneralMenu.cpp
  99. +6 −1 src/GeneralMenu.h
  100. +1 −1  src/Header.cpp
  101. +1 −1  src/Header.h
  102. +1 −1  src/Log.cpp
  103. +1 −1  src/Log.h
  104. +1 −1  src/Notify.cpp
  105. +1 −1  src/Notify.h
  106. +1 −1  src/OptionWindow.cpp
  107. +1 −1  src/OptionWindow.h
  108. +1 −1  src/Request.cpp
  109. +1 −1  src/Request.h
  110. +1 −1  src/Transfers.cpp
  111. +1 −1  src/Transfers.h
  112. +1 −1  src/Utils.cpp
  113. +1 −1  src/Utils.h
  114. +1 −1  src/git-version.cpp
  115. +27 −27 tests/button.cpp
  116. +41 −46 tests/colorpicker.cpp
  117. +59 −81 tests/keybinding_config.cpp
  118. +27 −27 tests/label.cpp
  119. +42 −42 tests/scrollpane.cpp
  120. +28 −28 tests/submenu.cpp
  121. +27 −27 tests/textentry.cpp
  122. +28 −28 tests/textview.cpp
  123. +27 −27 tests/treeview.cpp
  124. +21 −21 tests/window.cpp
View
6 configure.ac
@@ -102,14 +102,16 @@ AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
if test "$GCC" = yes; then
AS_IF([test "$enable_debug" = yes],
[CFLAGS="-ggdb -O0 $CFLAGS"
- CXXFLAGS="-ggdb -O0 $CXXFLAGS"
- AC_DEFINE([DEBUG], [1], [Define if debugging is enabled.])],
+ CXXFLAGS="-ggdb -O0 $CXXFLAGS"],
[CFLAGS="-O2 $CFLAGS"
CXXFLAGS="-O2 $CXXFLAGS"])
fi
AC_SUBST([CFLAGS])
AC_SUBST([CXXFLAGS])
+AS_IF([test "$enable_debug" = yes],
+ [AC_DEFINE([DEBUG], [1], [Define if debugging is enabled.])])
+
dnl adl_RECURSIVE_EVAL(VALUE, RESULT)
dnl =================================
dnl Interpolate the VALUE in loop until it doesn't change,
View
2  cppconsui/AbstractDialog.cpp
@@ -86,4 +86,4 @@ void AbstractDialog::OnButtonResponse(Button& activator,
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/AbstractDialog.h
@@ -81,4 +81,4 @@ class AbstractDialog
#endif // __ABSTRACTDIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/AbstractLine.cpp
@@ -37,4 +37,4 @@ AbstractLine::AbstractLine(int w, int h)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/AbstractLine.h
@@ -55,4 +55,4 @@ class AbstractLine
#endif // __ABSTRACTLINE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/AbstractListBox.cpp
@@ -63,4 +63,4 @@ void AbstractListBox::AddWidget(Widget& widget, int x, int y)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/AbstractListBox.h
@@ -89,4 +89,4 @@ class AbstractListBox
#endif // __ABSTRACTLISTBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Button.cpp
@@ -278,4 +278,4 @@ void Button::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
6 cppconsui/Button.h
@@ -50,9 +50,9 @@ class Button
FLAG_RIGHT = 1 << 2
};
- Button(int w, int h, const char *text_ = NULL, int flags_ = 0,
+ Button(int w, int h, const char *text_ = NULL, int flags_ = 0,
bool masked_ = false);
- explicit Button(const char *text_ = NULL, int flags_ = 0,
+ explicit Button(const char *text_ = NULL, int flags_ = 0,
bool masked_ = false);
Button(int w, int h, int flags_ = 0, const char *text_ = NULL,
const char *value_ = NULL, const char *unit_ = NULL,
@@ -121,4 +121,4 @@ class Button
#endif // __BUTTON_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/CheckBox.cpp
@@ -169,4 +169,4 @@ void CheckBox::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/CheckBox.h
@@ -84,4 +84,4 @@ class CheckBox
#endif // __CHECKBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPicker.cpp
@@ -123,4 +123,4 @@ void ColorPicker::Sample::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPicker.h
@@ -86,4 +86,4 @@ class ColorPicker
#endif // __COLORPICKER_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerComboBox.cpp
@@ -230,4 +230,4 @@ void ColorPickerComboBox::ColorButton::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerComboBox.h
@@ -113,4 +113,4 @@ class ColorPickerComboBox
#endif // __COLORPICKERCOMBOBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerDialog.cpp
@@ -63,4 +63,4 @@ void ColorPickerDialog::EmitResponse(ResponseType response)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerDialog.h
@@ -71,4 +71,4 @@ class ColorPickerDialog
#endif // __COLORPICKERDIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerPalette.cpp
@@ -193,4 +193,4 @@ void ColorPickerPalette::ColorPickerPaletteButton::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorPickerPalette.h
@@ -93,4 +93,4 @@ class ColorPickerPalette
#endif // __COLORPICKERPALETTE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorScheme.cpp
@@ -141,4 +141,4 @@ void ColorScheme::Clear()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ColorScheme.h
@@ -105,4 +105,4 @@ class ColorScheme
#endif // __COLORSCHEME_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ComboBox.cpp
@@ -170,4 +170,4 @@ void ComboBox::DropDownClose(FreeWindow& window)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
4 cppconsui/ComboBox.h
@@ -11,7 +11,7 @@
*
* CenterIM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Softwareee the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
@@ -123,4 +123,4 @@ class ComboBox
#endif // __COMBOBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ConsuiCurses.cpp
@@ -522,4 +522,4 @@ int onscreen_width(gunichar uc, int w)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ConsuiCurses.h
@@ -180,4 +180,4 @@ int onscreen_width(gunichar uc, int w = 0);
#endif // __CONSUICURSES_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Container.cpp
@@ -575,4 +575,4 @@ void Container::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Container.h
@@ -251,4 +251,4 @@ class Container
#endif // __CONTAINER_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/CoreManager.cpp
@@ -545,4 +545,4 @@ void CoreManager::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/CoreManager.h
@@ -166,4 +166,4 @@ class CoreManager
#endif // __APPLICATION_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/CppConsUI.h
@@ -96,4 +96,4 @@ class Rect: public Point
#endif // __CPPCONSUI_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Dialog.cpp
@@ -48,4 +48,4 @@ void Dialog::EmitResponse(ResponseType response)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Dialog.h
@@ -60,4 +60,4 @@ class Dialog
#endif // __DIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/FreeWindow.cpp
@@ -246,4 +246,4 @@ void FreeWindow::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/FreeWindow.h
@@ -127,4 +127,4 @@ class FreeWindow
#endif // __FREEWINDOW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/HorizontalLine.cpp
@@ -54,4 +54,4 @@ void HorizontalLine::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/HorizontalLine.h
@@ -59,4 +59,4 @@ class HorizontalLine
#endif // __HORIZONTALLINE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/HorizontalListBox.cpp
@@ -202,4 +202,4 @@ void HorizontalListBox::UpdateScrollWidth()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/HorizontalListBox.h
@@ -86,4 +86,4 @@ class HorizontalListBox
#endif // __HORIZONTALLISTBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/InputDialog.cpp
@@ -56,4 +56,4 @@ void InputDialog::EmitResponse(ResponseType response)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/InputDialog.h
@@ -70,4 +70,4 @@ class InputDialog
#endif // __INPUTDIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/InputProcessor.cpp
@@ -104,4 +104,4 @@ bool InputProcessor::ProcessInputText(const TermKeyKey& key)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/InputProcessor.h
@@ -167,4 +167,4 @@ class InputProcessor
#endif // __INPUTPROCESSOR_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/KeyConfig.cpp
@@ -152,4 +152,4 @@ void KeyConfig::LoadDefaultKeyConfig()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/KeyConfig.h
@@ -140,4 +140,4 @@ class KeyConfig
#endif // __KEYCONFIG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Keys.cpp
@@ -68,4 +68,4 @@ TermKeyKey RefineKey(const TermKeyKey& k)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Keys.h
@@ -50,4 +50,4 @@ TermKeyKey RefineKey(const TermKeyKey& k);
#endif // __KEYS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Label.cpp
@@ -115,4 +115,4 @@ void Label::SetText(const char *new_text)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Label.h
@@ -69,4 +69,4 @@ class Label
#endif // __LABEL_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ListBox.cpp
@@ -204,4 +204,4 @@ void ListBox::UpdateScrollHeight()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ListBox.h
@@ -86,4 +86,4 @@ class ListBox
#endif // __LISTBOX_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/MenuWindow.cpp
@@ -278,4 +278,4 @@ void MenuWindow::OnRefWidgetDestroy()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/MenuWindow.h
@@ -134,4 +134,4 @@ class MenuWindow
#endif // __MENUWINDOW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/MessageDialog.cpp
@@ -49,4 +49,4 @@ void MessageDialog::EmitResponse(ResponseType response)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/MessageDialog.h
@@ -61,4 +61,4 @@ class MessageDialog
#endif // __MESSAGEDIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Panel.cpp
@@ -129,4 +129,4 @@ const char *Panel::GetTitle() const
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Panel.h
@@ -77,4 +77,4 @@ class Panel
#endif // __PANEL_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ScrollPane.cpp
@@ -281,4 +281,4 @@ bool ScrollPane::MakePointVisible(int x, int y)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/ScrollPane.h
@@ -137,4 +137,4 @@ class ScrollPane
#endif // __SCROLLPANE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Spacer.cpp
@@ -41,4 +41,4 @@ void Spacer::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Spacer.h
@@ -54,4 +54,4 @@ class Spacer
#endif // __SPACER_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/SplitDialog.cpp
@@ -194,4 +194,4 @@ void SplitDialog::OnOldFocusVisible(Widget& activator, bool visible)
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/SplitDialog.h
@@ -78,4 +78,4 @@ class SplitDialog
#endif // __SPLITDIALOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TextEdit.cpp
@@ -940,4 +940,4 @@ void TextEdit::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
4 cppconsui/TextEdit.h
@@ -47,7 +47,7 @@ class TextEdit
};
TextEdit(int w, int h, const char *text_ = NULL, int flags_ = 0,
- bool single_line = false, bool accept_tabs_ = true,
+ bool single_line = false, bool accept_tabs_ = true,
bool masked_ = false);
virtual ~TextEdit();
@@ -253,4 +253,4 @@ class TextEdit
#endif // __TEXTEDIT_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TextEntry.cpp
@@ -61,4 +61,4 @@ void TextEntry::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TextEntry.h
@@ -56,4 +56,4 @@ class TextEntry
#endif // __TEXT_ENTRY_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TextView.cpp
@@ -493,4 +493,4 @@ void TextView::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TextView.h
@@ -177,4 +177,4 @@ class TextView
#endif // __TEXTVIEW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TreeView.cpp
@@ -649,4 +649,4 @@ void TreeView::DeclareBindables()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/TreeView.h
@@ -241,4 +241,4 @@ class TreeView
#endif // __TREEVIEW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/VerticalLine.cpp
@@ -54,4 +54,4 @@ void VerticalLine::Draw()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/VerticalLine.h
@@ -59,4 +59,4 @@ class VerticalLine
#endif // __VERTICALLINE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Widget.cpp
@@ -330,4 +330,4 @@ Container *Widget::GetTopContainer()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Widget.h
@@ -253,4 +253,4 @@ class Widget
#endif // __WIDGET_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Window.cpp
@@ -135,4 +135,4 @@ void Window::ResizeAndUpdateArea()
} // namespace CppConsUI
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  cppconsui/Window.h
@@ -78,4 +78,4 @@ class Window
#endif // __WINDOW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/AccountStatusMenu.cpp
@@ -149,4 +149,4 @@ void AccountStatusMenu::OpenStatusPopup(CppConsUI::Button& activator,
status_popup->Show();
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/AccountStatusMenu.h
@@ -65,4 +65,4 @@ class AccountStatusMenu
#endif // __ACOUNTSTATUSMENU_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/AccountWindow.cpp
@@ -601,4 +601,4 @@ void AccountWindow::DropAccountResponseHandler(
}
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/AccountWindow.h
@@ -234,4 +234,4 @@ class AccountWindow
#endif // __ACCOUNTSWINDOW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Accounts.cpp
@@ -244,4 +244,4 @@ void Accounts::deny_no_add_cb(AuthAndAdd *aa)
delete aa;
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Accounts.h
@@ -127,4 +127,4 @@ class Accounts
#endif // __ACCOUNTS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/BuddyList.cpp
@@ -539,4 +539,4 @@ void BuddyList::blist_pref_change(const char *name, PurplePrefType type,
}
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/BuddyList.h
@@ -134,4 +134,4 @@ class BuddyList
#endif // __BUDDYLIST_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
41 src/BuddyListNode.cpp
@@ -107,11 +107,12 @@ BuddyListNode::ContextMenu::ContextMenu(BuddyListNode& parent_node_)
void BuddyListNode::ContextMenu::OnMenuAction(Button& activator,
PurpleCallback callback, void *data)
{
- if (callback) {
- typedef void (*TypedCallback)(void *, void *);
- TypedCallback real_callback = reinterpret_cast<TypedCallback>(callback);
- real_callback(parent_node->GetPurpleBlistNode(), data);
- }
+ g_assert(callback);
+
+ typedef void (*TypedCallback)(void *, void *);
+ TypedCallback real_callback = reinterpret_cast<TypedCallback>(callback);
+ real_callback(parent_node->GetPurpleBlistNode(), data);
+
Close();
}
@@ -128,6 +129,9 @@ void BuddyListNode::ContextMenu::AppendMenuAction(MenuWindow& menu,
menu.AppendItem(act->label, sigc::bind(sigc::mem_fun(this,
&BuddyListNode::ContextMenu::OnMenuAction), act->callback,
act->data));
+ else {
+ // TODO display non-focusable widget?
+ }
}
else {
MenuWindow *submenu = new MenuWindow(0, 0, AUTOSIZE, AUTOSIZE);
@@ -151,7 +155,6 @@ void BuddyListNode::ContextMenu::AppendProtocolMenu(PurpleConnection *gc)
{
PurplePluginProtocolInfo *prpl_info
= PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
-
if (!prpl_info || !prpl_info->blist_node_menu)
return;
@@ -172,7 +175,6 @@ void BuddyListNode::ContextMenu::AppendExtendedMenu()
{
GList *ll = purple_blist_node_get_extended_menu(
parent_node->GetPurpleBlistNode());
-
for (GList *l = ll; l; l = l->next) {
PurpleMenuAction *act = reinterpret_cast<PurpleMenuAction*>(l->data);
AppendMenuAction(*this, act);
@@ -930,29 +932,32 @@ void BuddyListGroup::GroupContextMenu::RemoveResponseHandler(
// based on gtkdialogs.c:pidgin_dialogs_remove_group_cb()
PurpleGroup *group = parent_group->GetPurpleGroup();
- PurpleBlistNode *cnode = reinterpret_cast<PurpleBlistNode*>(group)->child;
+ PurpleBlistNode *cnode = purple_blist_node_get_first_child(
+ reinterpret_cast<PurpleBlistNode*>(group));
while (cnode) {
if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
- PurpleBlistNode *bnode = cnode->child;
- cnode = cnode->next;
+ PurpleBlistNode *bnode = purple_blist_node_get_first_child(cnode);
+ cnode = purple_blist_node_get_sibling_next(cnode);
while (bnode)
if (PURPLE_BLIST_NODE_IS_BUDDY(bnode)) {
PurpleBuddy *buddy = reinterpret_cast<PurpleBuddy*>(bnode);
- bnode = bnode->next;
- if (purple_account_is_connected(buddy->account))
- purple_account_remove_buddy(buddy->account, buddy, group);
- purple_blist_remove_buddy(buddy);
+ PurpleAccount *account = purple_buddy_get_account(buddy);
+ bnode = purple_blist_node_get_sibling_next(bnode);
+ if (purple_account_is_connected(account)) {
+ purple_account_remove_buddy(account, buddy, group);
+ purple_blist_remove_buddy(buddy);
+ }
}
else
- bnode = bnode->next;
+ bnode = purple_blist_node_get_sibling_next(bnode);
}
else if (PURPLE_BLIST_NODE_IS_CHAT(cnode)) {
PurpleChat *chat = reinterpret_cast<PurpleChat*>(cnode);
- cnode = cnode->next;
+ cnode = purple_blist_node_get_sibling_next(cnode);
purple_blist_remove_chat(chat);
}
else
- cnode = cnode->next;
+ cnode = purple_blist_node_get_sibling_next(cnode);
}
/* Close the context menu before the group is deleted because its deletion
@@ -990,4 +995,4 @@ BuddyListGroup::BuddyListGroup(PurpleBlistNode *node)
group = reinterpret_cast<PurpleGroup*>(node);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/BuddyListNode.h
@@ -320,4 +320,4 @@ friend class BuddyListNode;
#endif // _BUDDYLISTNODE_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/CenterIM.cpp
@@ -1028,4 +1028,4 @@ void CenterIM::DeclareBindables()
InputProcessor::BINDABLE_OVERRIDE);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/CenterIM.h
@@ -188,4 +188,4 @@ class CenterIM
#endif // __CENTERIM_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/CenterMain.cpp
@@ -71,4 +71,4 @@ int main(int argc, char *argv[])
return cim->Run(config_path);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Connections.cpp
@@ -180,4 +180,4 @@ void Connections::report_disconnect_reason(PurpleConnection *gc,
}
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Connections.h
@@ -79,4 +79,4 @@ class Connections
#endif // __CONNECTIONS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Conversation.cpp
@@ -618,4 +618,4 @@ void Conversation::DeclareBindables()
InputProcessor::BINDABLE_OVERRIDE);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Conversation.h
@@ -82,4 +82,4 @@ class Conversation
#endif // __CONVERSATION_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Conversations.cpp
@@ -319,4 +319,4 @@ void Conversations::present(PurpleConversation *conv)
ActivateConversation(i);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Conversations.h
@@ -109,4 +109,4 @@ class Conversations
#endif // __CONVERSATIONS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Footer.cpp
@@ -134,4 +134,4 @@ void Footer::UpdateText()
label->SetText(out);
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Footer.h
@@ -64,4 +64,4 @@ class Footer
#endif // __FOOTER_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
32 src/GeneralMenu.cpp
@@ -33,11 +33,6 @@ GeneralMenu::GeneralMenu()
{
SetColorScheme("generalmenu");
- /*
- AppendItem(_("Testing"), sigc::mem_fun(this, &GeneralMenu::OpenTestWindow));
- AppendItem(_("Change status"), sigc::mem_fun(this, &GeneralMenu::Dummy));
- AppendItem(_("Go to contact..."), sigc::mem_fun(this, &GeneralMenu::Dummy));
- */
AppendItem(_("Accounts..."), sigc::mem_fun(this,
&GeneralMenu::OpenAccountWindow));
AppendItem(_("Add buddy..."), sigc::mem_fun(this,
@@ -48,31 +43,12 @@ GeneralMenu::GeneralMenu()
&GeneralMenu::OpenAddGroupRequest));
AppendItem(_("Config options..."), sigc::mem_fun(this,
&GeneralMenu::OpenOptionWindow));
- /*
- AppendSeparator();
- AppendItem(_("Find/add users"), sigc::mem_fun(this, &GeneralMenu::Dummy));
- AppendItem(_("Join channel/conference"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendItem(_("Link an RSS feed"), sigc::mem_fun(this, &GeneralMenu::Dummy));
- AppendSeparator();
- AppendItem(_("View/edit ignore list"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendItem(_("View/edit invisible list"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendItem(_("View/edit visible list"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendSeparator();
- AppendItem(_("Show offline users"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendItem(_("Organize contact groups"), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- AppendItem(_("Mass group move..."), sigc::mem_fun(this,
- &GeneralMenu::Dummy));
- */
AppendSeparator();
+#ifdef DEBUG
AppendItem("Request test...", sigc::mem_fun(this,
&GeneralMenu::RequestTest));
AppendSeparator();
+#endif // DEBUG
AppendItem(_("Quit"), sigc::hide(sigc::mem_fun(CENTERIM,
&CenterIM::Quit)));
}
@@ -115,6 +91,7 @@ void GeneralMenu::OpenOptionWindow(CppConsUI::Button& activator)
Close();
}
+#ifdef DEBUG
void GeneralMenu::RequestTest(CppConsUI::Button& activator)
{
#if 0
@@ -243,5 +220,6 @@ void GeneralMenu::fields_ok_cb(PurpleRequestFields *fields)
purple_account_get_protocol_name(account),
purple_account_get_username(account));
}
+#endif // DEBUG
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
7 src/GeneralMenu.h
@@ -22,6 +22,8 @@
#ifndef __GENERALMENU_H__
#define __GENERALMENU_H__
+#include "config.h"
+
#include <cppconsui/MenuWindow.h>
#include <libpurple/purple.h>
@@ -46,6 +48,8 @@ class GeneralMenu
void OpenAddChatRequest(CppConsUI::Button& activator);
void OpenAddGroupRequest(CppConsUI::Button& activator);
void OpenOptionWindow(CppConsUI::Button& activator);
+
+#ifdef DEBUG
void RequestTest(CppConsUI::Button& activator);
static void input_ok_cb_(void *data, const char *text)
@@ -63,8 +67,9 @@ class GeneralMenu
static void fields_ok_cb_(void *data, PurpleRequestFields *fields)
{ reinterpret_cast<GeneralMenu*>(data)->fields_ok_cb(fields); }
void fields_ok_cb(PurpleRequestFields *fields);
+#endif // DEBUG
};
#endif // __GENERALMENU_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Header.cpp
@@ -187,4 +187,4 @@ void Header::account_disabled(PurpleAccount *account)
}
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Header.h
@@ -87,4 +87,4 @@ class Header
#endif // __HEADER_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Log.cpp
@@ -402,4 +402,4 @@ Log::Level Log::GetLogLevel(const char *type)
return level;
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Log.h
@@ -144,4 +144,4 @@ class Log
#endif // __LOG_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Notify.cpp
@@ -73,4 +73,4 @@ void *Notify::notify_message(PurpleNotifyMsgType type, const char *title,
return NULL;
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Notify.h
@@ -56,4 +56,4 @@ class Notify
#endif // __NOTIFY_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/OptionWindow.cpp
@@ -350,4 +350,4 @@ void OptionWindow::ReloadColorSchemes(CppConsUI::Button& activator) const
LOG->Message(_("Colorscheme file was successfully reloaded."));
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/OptionWindow.h
@@ -129,4 +129,4 @@ class OptionWindow
#endif // __OPTIONWINDOW_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Request.cpp
@@ -758,4 +758,4 @@ void *Request::request_action_with_icon(const char *title,
return NULL;
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Request.h
@@ -442,4 +442,4 @@ class Request
#endif // __REQUEST_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Transfers.cpp
@@ -29,4 +29,4 @@ Transfers::~Transfers()
{
}
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Transfers.h
@@ -35,4 +35,4 @@ class Transfers
#endif // __TRANSFERS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Utils.cpp
@@ -97,4 +97,4 @@ char *GetColorSchemeString(const char *base_color_scheme, PurpleBuddy *buddy)
} // namespace utils
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/Utils.h
@@ -33,4 +33,4 @@ char *GetColorSchemeString(const char *base_color_scheme, PurpleBuddy *buddy);
#endif // __UTILS_H__
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
2  src/git-version.cpp
@@ -23,4 +23,4 @@
const char * const CenterIM::version = GIT_VERSION;
-/* vim: set tabstop=2 shiftwidth=2 tw=78 expandtab : */
+/* vim: set tabstop=2 shiftwidth=2 textwidth=78 expandtab : */
View
54 tests/button.cpp
@@ -7,23 +7,23 @@
class ButtonWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static ButtonWindow *Instance();
- virtual void Close() {}
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static ButtonWindow *Instance();
+ virtual void Close() {}
- protected:
+protected:
- private:
- CppConsUI::Label *label;
+private:
+ CppConsUI::Label *label;
- ButtonWindow();
- virtual ~ButtonWindow() {}
- ButtonWindow(const ButtonWindow&);
- ButtonWindow& operator=(const ButtonWindow&);
+ ButtonWindow();
+ virtual ~ButtonWindow() {}
+ ButtonWindow(const ButtonWindow&);
+ ButtonWindow& operator=(const ButtonWindow&);
- void OnButtonActivate(CppConsUI::Button& activator);
+ void OnButtonActivate(CppConsUI::Button& activator);
};
ButtonWindow *ButtonWindow::Instance()
@@ -103,25 +103,25 @@ void ButtonWindow::OnButtonActivate(CppConsUI::Button& activator)
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
87 tests/colorpicker.cpp
@@ -11,36 +11,31 @@
class TestWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static TestWindow *Instance();
- virtual void Close() {}
-
- protected:
-
- private:
- CppConsUI::Label *label1;
- CppConsUI::Label *label2;
- int defaultcolor;
- CppConsUI::ColorPickerComboBox *combo;
-
- TestWindow();
- virtual ~TestWindow();
- TestWindow(const TestWindow&);
- TestWindow& operator=(const TestWindow&);
-
- void OnButtonActivate(CppConsUI::Button& activator, int flags);
- void OnChangeColorResponseHandler(
- CppConsUI::ColorPickerDialog& activator,
- CppConsUI::AbstractDialog::ResponseType response,
- int color);
- void OnColerPickerChanged(CppConsUI::ColorPicker& activator,
- int new_fg, int new_bg);
- void OnComboColorChange(
- CppConsUI::ComboBox& activator,
- intptr_t color);
-
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static TestWindow *Instance();
+ virtual void Close() {}
+
+protected:
+
+private:
+ CppConsUI::Label *label1;
+ CppConsUI::Label *label2;
+ int defaultcolor;
+ CppConsUI::ColorPickerComboBox *combo;
+
+ TestWindow();
+ virtual ~TestWindow();
+ TestWindow(const TestWindow&);
+ TestWindow& operator=(const TestWindow&);
+
+ void OnButtonActivate(CppConsUI::Button& activator, int flags);
+ void OnChangeColorResponseHandler(CppConsUI::ColorPickerDialog& activator,
+ CppConsUI::AbstractDialog::ResponseType response, int color);
+ void OnColerPickerChanged(CppConsUI::ColorPicker& activator, int new_fg,
+ int new_bg);
+ void OnComboColorChange(CppConsUI::ComboBox& activator, intptr_t color);
};
TestWindow *TestWindow::Instance()
@@ -87,7 +82,7 @@ TestWindow::TestWindow()
label2->SetText("...");
- char *text = g_strdup_printf("Supported nr of colors: %d",
+ char *text = g_strdup_printf("Supported nr of colors: %d",
CppConsUI::Curses::nrcolors());
label1->SetText(text);
g_free(text);
@@ -96,7 +91,7 @@ TestWindow::TestWindow()
AddWidget(*l, 1, 12);
l = new CppConsUI::Label();
- text = g_strdup_printf("Supported nr of color pairs: %d",
+ text = g_strdup_printf("Supported nr of color pairs: %d",
CppConsUI::Curses::nrcolorpairs());
l->SetText(text);
g_free(text);
@@ -174,25 +169,25 @@ void TestWindow::OnComboColorChange(
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
140 tests/keybinding_config.cpp
@@ -9,66 +9,53 @@
class TestWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static TestWindow *Instance();
- virtual void Close() {}
-
- //
-
- void SetConfigFile(const char *filename);
- bool Reconfig();
- void AddDefaultKeyBind(const char *context, const char *action,
- const char *key);
- void RegisterDefaultKeyBinds();
- bool ReconfigInternal();
- static void start_element_(GMarkupParseContext *context,
- const char *element_name, const char **attribute_names,
- const char **attribute_values, gpointer user_data,
- GError **error)
- { reinterpret_cast<TestWindow*>(user_data)->start_element(context,
- element_name, attribute_names, attribute_values, error); }
- void start_element(GMarkupParseContext *context,
- const char *element_name, const char **attribute_names,
- const char **attribute_values, GError **error);
-
-
-
- protected:
-
- private:
- //
-
- struct DefaultKeyBind
- {
- std::string context;
- std::string action;
- std::string key;
-
- DefaultKeyBind(const char *context_, const char *action_,
- const char *key_) : context(context_), action(action_), key(key_) {}
- };
- typedef std::vector<DefaultKeyBind> DefaultKeyBinds;
-
- DefaultKeyBinds default_key_binds;
-
- // Keybindings filename
- char *config;
-
- //
-
- TestWindow();
- virtual ~TestWindow();
- TestWindow(const TestWindow&);
- TestWindow& operator=(const TestWindow&);
-
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static TestWindow *Instance();
+ virtual void Close() {}
+
+ void SetConfigFile(const char *filename);
+ bool Reconfig();
+ void AddDefaultKeyBind(const char *context, const char *action,
+ const char *key);
+ void RegisterDefaultKeyBinds();
+ bool ReconfigInternal();
+ static void start_element_(GMarkupParseContext *context,
+ const char *element_name, const char **attribute_names,
+ const char **attribute_values, gpointer user_data,
+ GError **error)
+ { reinterpret_cast<TestWindow*>(user_data)->start_element(context,
+ element_name, attribute_names, attribute_values, error); }
+ void start_element(GMarkupParseContext *context,
+ const char *element_name, const char **attribute_names,
+ const char **attribute_values, GError **error);
+
+protected:
+
+private:
+ struct DefaultKeyBind
+ {
+ std::string context;
+ std::string action;
+ std::string key;
+
+ DefaultKeyBind(const char *context_, const char *action_,
+ const char *key_) : context(context_), action(action_), key(key_) {}
+ };
+ typedef std::vector<DefaultKeyBind> DefaultKeyBinds;
+
+ DefaultKeyBinds default_key_binds;
+
+ // keybindings filename
+ char *config;
+
+ TestWindow();
+ virtual ~TestWindow() {}
+ TestWindow(const TestWindow&);
+ TestWindow& operator=(const TestWindow&);
};
-//
-//
-//
-
void TestWindow::SetConfigFile(const char *filename)
{
if (config)
@@ -253,11 +240,6 @@ void TestWindow::start_element(GMarkupParseContext *context,
_("Unexpected element '%s'"), element_name);
}
-
-//
-//
-//
-
TestWindow *TestWindow::Instance()
{
static TestWindow instance;
@@ -324,33 +306,29 @@ TestWindow::TestWindow()
Reconfig();
}
-TestWindow::~TestWindow()
-{
-}
-
// TestApp class
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
54 tests/label.cpp
@@ -7,19 +7,19 @@
class LabelWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static LabelWindow *Instance();
- virtual void Close() {}
-
- protected:
-
- private:
- LabelWindow();
- virtual ~LabelWindow() {}
- LabelWindow(const LabelWindow&);
- LabelWindow& operator=(const LabelWindow&);
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static LabelWindow *Instance();
+ virtual void Close() {}
+
+protected:
+
+private:
+ LabelWindow();
+ virtual ~LabelWindow() {}
+ LabelWindow(const LabelWindow&);
+ LabelWindow& operator=(const LabelWindow&);
};
LabelWindow *LabelWindow::Instance()
@@ -94,25 +94,25 @@ LabelWindow::LabelWindow()
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
84 tests/scrollpane.cpp
@@ -28,18 +28,18 @@ static const char *pic[] =
class MyScrollPane
: public CppConsUI::ScrollPane
{
- public:
- MyScrollPane(int w, int h, int scrollw, int scrollh);
- virtual ~MyScrollPane() {}
+public:
+ MyScrollPane(int w, int h, int scrollw, int scrollh);
+ virtual ~MyScrollPane() {}
- // Widget
- virtual void Draw();
+ // Widget
+ virtual void Draw();
- protected:
+protected:
- private:
- MyScrollPane(const MyScrollPane&);
- MyScrollPane& operator=(const MyScrollPane&);
+private:
+ MyScrollPane(const MyScrollPane&);
+ MyScrollPane& operator=(const MyScrollPane&);
};
MyScrollPane::MyScrollPane(int w, int h, int scrollw, int scrollh)
@@ -72,25 +72,25 @@ void MyScrollPane::Draw()
class ScrollPaneWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static ScrollPaneWindow *Instance();
- virtual void Close() {}
-
- protected:
- MyScrollPane *pane;
-
- private:
- ScrollPaneWindow();
- virtual ~ScrollPaneWindow() {}
- ScrollPaneWindow(const ScrollPaneWindow&);
- ScrollPaneWindow& operator=(const ScrollPaneWindow&);
-
- void ScrollUp();
- void ScrollDown();
- void ScrollLeft();
- void ScrollRight();
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static ScrollPaneWindow *Instance();
+ virtual void Close() {}
+
+protected:
+ MyScrollPane *pane;
+
+private:
+ ScrollPaneWindow();
+ virtual ~ScrollPaneWindow() {}
+ ScrollPaneWindow(const ScrollPaneWindow&);
+ ScrollPaneWindow& operator=(const ScrollPaneWindow&);
+
+ void ScrollUp();
+ void ScrollDown();
+ void ScrollLeft();
+ void ScrollRight();
};
ScrollPaneWindow *ScrollPaneWindow::Instance()
@@ -148,25 +148,25 @@ void ScrollPaneWindow::ScrollRight()
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
56 tests/submenu.cpp
@@ -8,24 +8,24 @@
class SubMenuWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static SubMenuWindow *Instance();
- virtual void Close() {}
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static SubMenuWindow *Instance();
+ virtual void Close() {}
- protected:
+protected:
- private:
- CppConsUI::Label *label;
- CppConsUI::MenuWindow *menu;
+private:
+ CppConsUI::Label *label;
+ CppConsUI::MenuWindow *menu;
- SubMenuWindow();
- virtual ~SubMenuWindow();
- SubMenuWindow(const SubMenuWindow&);
- SubMenuWindow& operator=(const SubMenuWindow&);
+ SubMenuWindow();
+ virtual ~SubMenuWindow();
+ SubMenuWindow(const SubMenuWindow&);
+ SubMenuWindow& operator=(const SubMenuWindow&);
- void OnButtonActivate(CppConsUI::Button& activator);
+ void OnButtonActivate(CppConsUI::Button& activator);
};
SubMenuWindow *SubMenuWindow::Instance()
@@ -98,25 +98,25 @@ void SubMenuWindow::OnButtonActivate(CppConsUI::Button& activator)
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
54 tests/textentry.cpp
@@ -9,19 +9,19 @@
class TextEntryWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static TextEntryWindow *Instance();
- virtual void Close() {}
-
- protected:
-
- private:
- TextEntryWindow();
- virtual ~TextEntryWindow() {}
- TextEntryWindow(const TextEntryWindow&);
- TextEntryWindow& operator=(const TextEntryWindow&);
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static TextEntryWindow *Instance();
+ virtual void Close() {}
+
+protected:
+
+private:
+ TextEntryWindow();
+ virtual ~TextEntryWindow() {}
+ TextEntryWindow(const TextEntryWindow&);
+ TextEntryWindow& operator=(const TextEntryWindow&);
};
TextEntryWindow *TextEntryWindow::Instance()
@@ -66,25 +66,25 @@ TextEntryWindow::TextEntryWindow()
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
56 tests/textview.cpp
@@ -8,24 +8,24 @@
class TextViewWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by
- * overriding Close() method. */
- static TextViewWindow *Instance();
- virtual void Close() {}
+public:
+ /* This is a main window, make sure it can not be closed with ESC key by
+ * overriding Close() method. */
+ static TextViewWindow *Instance();
+ virtual void Close() {}
- virtual void ScreenResized();
+ virtual void ScreenResized();
- protected:
- CppConsUI::TextView *textview;
+protected:
+ CppConsUI::TextView *textview;
- private:
- TextViewWindow();
- virtual ~TextViewWindow() {}
- TextViewWindow(const TextViewWindow&);
- TextViewWindow& operator=(const TextViewWindow&);
+private:
+ TextViewWindow();
+ virtual ~TextViewWindow() {}
+ TextViewWindow(const TextViewWindow&);
+ TextViewWindow& operator=(const TextViewWindow&);
- void ActionToggleScrollbar();
+ void ActionToggleScrollbar();
};
TextViewWindow *TextViewWindow::Instance()
@@ -94,25 +94,25 @@ void TextViewWindow::ActionToggleScrollbar()
class TestApp
: public CppConsUI::InputProcessor
{
- public:
- static TestApp *Instance();
+public:
+ static TestApp *Instance();
- void Run();
+ void Run();
- // ignore every message
- static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message, gpointer user_data)
- {}
+ // ignore every message
+ static void g_log_func_(const gchar *log_domain, GLogLevelFlags log_level,
+ const gchar *message, gpointer user_data)
+ {}
- protected:
+protected:
- private:
- CppConsUI::CoreManager *mngr;
+private:
+ CppConsUI::CoreManager *mngr;
- TestApp();
- TestApp(const TestApp&);
- TestApp& operator=(const TestApp&);
- virtual ~TestApp() {}
+ TestApp();
+ TestApp(const TestApp&);
+ TestApp& operator=(const TestApp&);
+ virtual ~TestApp() {}
};
TestApp *TestApp::Instance()
View
54 tests/treeview.cpp
@@ -9,19 +9,19 @@
class TreeViewWindow
: public CppConsUI::Window
{
- public:
- /* This is a main window, make sure it can not be closed with ESC key by