aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
authorGravatar Robert Förster2012-02-29 05:33:52 +0000
committerGravatar Robert Förster2012-02-29 05:33:52 +0000
commitfd6b0a334036131c27a1c3d004db40272ce61f37 (patch)
tree30f261eae45c07389ba1ea869a01bef08eea083b /src/modules/objects
parentI previously broke the objects module, this should fix it (diff)
downloadKVIrc-fd6b0a334036131c27a1c3d004db40272ce61f37.tar.gz
KVIrc-fd6b0a334036131c27a1c3d004db40272ce61f37.tar.bz2
KVIrc-fd6b0a334036131c27a1c3d004db40272ce61f37.zip
fix some indentation which got lost in the last commit.
someone with too much free time should fix all the files to be indented correctly (right...) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6087 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/KvsObject_comboBox.cpp6
-rw-r--r--src/modules/objects/KvsObject_comboBox.h2
-rw-r--r--src/modules/objects/KvsObject_menuBar.cpp4
-rw-r--r--src/modules/objects/KvsObject_menuBar.h2
-rw-r--r--src/modules/objects/KvsObject_popupMenu.cpp22
-rw-r--r--src/modules/objects/KvsObject_popupMenu.h4
-rw-r--r--src/modules/objects/KvsObject_treeWidgeteItem.h4
-rw-r--r--src/modules/objects/KvsObject_widget.cpp20
8 files changed, 32 insertions, 32 deletions
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 7bda7adf4..2e811c136 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -49,7 +49,7 @@
[class]widget[/class]
@description:
@functions:
- !fn: $insertItem(<text:string>, <index:int>)
+ !fn: $insertItem(<text:string>, <index:int>)
Inserts a text item at position <index>. If index is negative or
not specified the item is appended.
!fn: $changeItem(<text:string>, <index:uint>)
@@ -83,7 +83,7 @@
!fn: $textAt(<index:uint>)
Returns item at given index.
!fn: $setCurrentItem(<index:uint>)
- Sets the current combobox item. This is the item to be displayed on the combobox button.
+ Sets the current combobox item. This is the item to be displayed on the combobox button.
!fn: $activatedEvent(<index:integer>)
This function is called by the framework when a new item has activated. The index value is the position of the new item.[br]
The default implementation emits the [classfnc]$activated[/classfnc]() signal,
@@ -99,7 +99,7 @@
*/
KVSO_BEGIN_REGISTERCLASS(KvsObject_comboBox,"combobox","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,changeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,removeItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,clear)
diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h
index cd178310a..a10ac6c29 100644
--- a/src/modules/objects/KvsObject_comboBox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -41,7 +41,7 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool insertItem(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool changeItem(KviKvsObjectFunctionCall *c);
bool removeItem(KviKvsObjectFunctionCall *c);
bool clear(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_menuBar.cpp b/src/modules/objects/KvsObject_menuBar.cpp
index 306a8a451..0a3a432ca 100644
--- a/src/modules/objects/KvsObject_menuBar.cpp
+++ b/src/modules/objects/KvsObject_menuBar.cpp
@@ -42,12 +42,12 @@
@description:
@functions:
- !fn: <integer> $insertItem(<text:string>)
+ !fn: <integer> $insertItem(<text:string>)
Returns an integer that identifies the inserted item.
*/
KVSO_BEGIN_REGISTERCLASS(KvsObject_menuBar,"menubar","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,insertItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,insertItem)
KVSO_END_REGISTERCLASS(KvsObject_menuBar)
KVSO_BEGIN_CONSTRUCTOR(KvsObject_menuBar,KvsObject_widget)
diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h
index f2348a248..074db95f1 100644
--- a/src/modules/objects/KvsObject_menuBar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -37,6 +37,6 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool insertItem(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
};
#endif // !_CLASS_MENUBAR_H_
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index fa1930c87..bf0987ec4 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -52,9 +52,9 @@
[class]widget[/class]
@description:
This widget can be used to display a popup menu.Technically, a popup menu consists of a list of menu items.[br]
- You add items with insertItem(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br]
+ You add items with insertItem(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br]
@functions:
- !fn: $insertItem(<text:string>,[icon_id:string])
+ !fn: $insertItem(<text:string>,[icon_id:string])
Inserts menu items into a popup menu with optional icon and return the popup identifier.
!fn: $addMenu(<popupmenu:hobject,[idx:uinteger])
Add a popupmenu.
@@ -68,7 +68,7 @@
Removes the menu item that has the identifier id.
!fn: $removeItemAt(<index:uinteger>)
Removes the menu item at position index.
- !fn: $insertSeparator(<index:uinteger>)
+ !fn: $insertSeparator(<index:uinteger>)
Inserts a separator at position index.[br]
If the index is negative the separator becomes the last menu item.
!fn: $activatedEvent(<popup_id:uinteger>)
@@ -91,11 +91,11 @@
constructor()
{
// we store the item's id for checkit in activatedEvent
- @%tile_id=@$insertItem("Tile",118)
- @%cascade_id=@$insertItem("Cascade",115)
- @$insertSeparator(3)
- @%closeactw_id=@$insertItem("Close Active Window",08)
- @%closeallw_id=@$insertItem("Close All Window",58)
+ @%tile_id=@$insertItem("Tile",118)
+ @%cascade_id=@$insertItem("Cascade",115)
+ @$insertSeparator(3)
+ @%closeactw_id=@$insertItem("Close Active Window",08)
+ @%closeallw_id=@$insertItem("Close All Window",58)
}
activatedEvent()
{
@@ -197,12 +197,12 @@ static void removeAction(int idx)
KVSO_BEGIN_REGISTERCLASS(KvsObject_popupMenu,"popupmenu","widget")
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertItem)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertItem)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,setTitle)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,exec)
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertSeparator)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertSeparator)
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,removeItem)
- KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addMenu)
+ KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addMenu)
// events
KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,highlightedEvent)
diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 732d43f26..ad0fc37c7 100644
--- a/src/modules/objects/KvsObject_popupMenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -44,13 +44,13 @@ public:
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- bool insertItem(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool setTitle(KviKvsObjectFunctionCall *c);
bool addMenu(KviKvsObjectFunctionCall *c);
bool exec(KviKvsObjectFunctionCall *c);
bool removeItem(KviKvsObjectFunctionCall *c);
bool removeItemAt(KviKvsObjectFunctionCall *c);
- bool insertSeparator(KviKvsObjectFunctionCall *c);
+ bool insertSeparator(KviKvsObjectFunctionCall *c);
bool activatedEvent(KviKvsObjectFunctionCall *c);
bool highlightedEvent(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index 4c99d5049..5b9e96197 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -42,7 +42,7 @@ protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
protected:
bool setText(KviKvsObjectFunctionCall *c);
- bool insertItem(KviKvsObjectFunctionCall *c);
+ bool insertItem(KviKvsObjectFunctionCall *c);
bool setPixmap(KviKvsObjectFunctionCall *c);
bool setItemEditable(KviKvsObjectFunctionCall *c);
bool isItemEditable(KviKvsObjectFunctionCall *c);
@@ -55,7 +55,7 @@ protected:
bool isCheckable(KviKvsObjectFunctionCall *c);
bool setChecked(KviKvsObjectFunctionCall *c);
bool isChecked(KviKvsObjectFunctionCall *c);
- bool setFlags(KviKvsObjectFunctionCall *c);
+ bool setFlags(KviKvsObjectFunctionCall *c);
public:
static kvs_hobject_t itemToHandle(QTreeWidgetItem * it);
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 3a9fa11c4..3243d26be 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -385,16 +385,16 @@ const char * const widgettypes_tbl[] = {
This function is called immediately after this widget has been moved.
If you call "[cmd]return[/cmd] $true" you will stop the internal processing
of this event. The default implementation does nothing.
- !fn: $paintEvent(<painter:h_object>,<rect_x:integer>,<rect_y:integer>,<width:integer>,<height:integer>)
+ !fn: $paintEvent(<painter:h_object>,<rect_x:integer>,<rect_y:integer>,<width:integer>,<height:integer>)
This event handler can be reimplemented to repaint all or part of the widget.
It's needed by the Painter class.
It's very useful for drawing flicker free animations or low level special graphic effects.
- The framework will pass as parameter a [class]painter[/class]object. You don't need to begin/end/delete the painter.
+ The framework will pass as parameter a [class]painter[/class]object. You don't need to begin/end/delete the painter.
If you call "[cmd]return[/cmd] $true" you will stop the internal processing
of this event.
The default implementation does nothing.
- !fn: $setParent(<widget_object:parent>)
- Sets the parent of the widget to parent
+ !fn: $setParent(<widget_object:parent>)
+ Sets the parent of the widget to parent
!fn: $setWindowIcon(<image_id>)
Sets the icon for this widget. This is meaningful only for toplevel widgets.
See the [doc:image_id]image identifier[/doc] documentation for the explaination
@@ -496,7 +496,7 @@ const char * const widgettypes_tbl[] = {
NoSystemBackground - Indicates that the widget has no background, i.e. when the widget receives paint events, the background is not automatically repainted.
PaintOnScreen - Indicates that the widget wants to draw directly onto the screen.
NoMousePropagation - Prohibits mouse events from being propagated to the widget's parent.
- !fn: $setStyleSheet(<string>)
+ !fn: $setStyleSheet(<string>)
Set a style sheet for this widget.
!fn: $customContextMenuRequestedEvent(<x_mouse_pos:integer>,<y_mouse_pos:integer>)
This event is triggered when the user has requested a context menu on the widget (i.e. right clicking on the widget).
@@ -515,7 +515,7 @@ const char * const widgettypes_tbl[] = {
!fn: <short_cut_id:integer> $setKeyShortCut(<key:char>)
Adds a shortcut whith key. A [classfnc]$shortCutEvent[/classfnc] will be triggered when the user will press alt+key.
- !fn: $shortCutEvent(<shortcut_id:integer>)
+ !fn: $shortCutEvent(<shortcut_id:integer>)
This function will be called when a shortcut key has been triggered.
You must reimplement this event to manage a shortcut system in a custom widget.
The default implementation does nothing.
@@ -550,12 +550,12 @@ const char * const widgettypes_tbl[] = {
%checkbox->$setText("This is a checkbox")
%combobox = $new(combobox,%box)
- %combobox->$insertItem("This is a combobox")
- %combobox->$insertItem("This is a combobox's item")
+ %combobox->$insertItem("This is a combobox")
+ %combobox->$insertItem("This is a combobox's item")
%listbox = $new(listbox,%box)
- %listbox->$insertItem("This is a listbox item")
- %listbox->$insertItem("This is another item")
+ %listbox->$insertItem("This is a listbox item")
+ %listbox->$insertItem("This is another item")
%radiobutton = $new(radiobutton,%box)
%radiobutton->$setText("This is a radiobutton")