diff options
| author | 2009-09-01 22:12:36 +0000 | |
|---|---|---|
| committer | 2009-09-01 22:12:36 +0000 | |
| commit | ea06d9bbbd8d8ef75034bfc3f62838f193537984 (patch) | |
| tree | a437eeabaa4b3d09f3313a6b0dd07b5bb961749d /src/modules/objects | |
| parent | updated splash screen (diff) | |
| download | KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.tar.gz KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.tar.bz2 KVIrc-ea06d9bbbd8d8ef75034bfc3f62838f193537984.zip | |
- trailing whitespace cleanups all over the place
- removed charset dependent manpages since it really makes no sense to distribute them, they are getting installed in non standard places and one manpage per language is enough
- added SpotChat to the serverdb, happens to be my network anyway :P (someone should remind me to check all the networks and servers there so we can do a cleanup if needed
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3463 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects')
21 files changed, 51 insertions, 51 deletions
diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/class_combobox.h index 5f40f1f93..9a88ead32 100644 --- a/src/modules/objects/class_combobox.h +++ b/src/modules/objects/class_combobox.h @@ -40,7 +40,7 @@ public: QWidget * widget() { return (QWidget *)object(); }; protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool insertItem(KviKvsObjectFunctionCall *c); bool changeItem(KviKvsObjectFunctionCall *c); bool removeItem(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h index 98ba85a75..74f784a8b 100644 --- a/src/modules/objects/class_dockwindow.h +++ b/src/modules/objects/class_dockwindow.h @@ -35,7 +35,7 @@ public: KVSO_DECLARE_OBJECT(KviKvsObject_dockwindow) protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool addWidget(KviKvsObjectFunctionCall *c); bool orientation(KviKvsObjectFunctionCall *c); bool setOrientation(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index a2ee75427..0a9337402 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -47,7 +47,7 @@ public: bool close(KviKvsObjectFunctionCall *c); bool flush(KviKvsObjectFunctionCall *c); bool size(KviKvsObjectFunctionCall *c); - + bool atEnd(KviKvsObjectFunctionCall *c); // int QFile at() const bool where(KviKvsObjectFunctionCall *c); @@ -56,7 +56,7 @@ public: bool putch(KviKvsObjectFunctionCall *c); bool getch(KviKvsObjectFunctionCall *c); bool unGetch(KviKvsObjectFunctionCall *c); - + bool readBlock(KviKvsObjectFunctionCall *c); bool writeBlock(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h index 31d809858..34f9258dc 100644 --- a/src/modules/objects/class_groupbox.h +++ b/src/modules/objects/class_groupbox.h @@ -40,7 +40,7 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool setTitle(KviKvsObjectFunctionCall *c); bool title(KviKvsObjectFunctionCall *c); bool setFlat(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index 19eab2336..155e9bd27 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -77,11 +77,11 @@ const char * const ssl_errors_tbl[] = { This class provides a standard HTTP functionality.[br] @functions: !fn: <id:integer>$get(<remote_path:string>,<local_file: string>) - + !fn: <id:integer>$post(<remote_path:string>,<post_data:string>,<local_file: string>) !fn: $abort() !fn: <id:integer>$setHost(<host:string>,<remote_port:unsigned_integer>) - + !fn: <id:integer>$currentId() !fn: $setProxy(<host:string>,<port:integer>,[<user:string>,<password:string>]) !fn: $setUser(<user:string>,<password:string>) diff --git a/src/modules/objects/class_http.h b/src/modules/objects/class_http.h index 2ab73d69a..70c2bb691 100644 --- a/src/modules/objects/class_http.h +++ b/src/modules/objects/class_http.h @@ -65,7 +65,7 @@ protected: bool functionFollowRedirect(KviKvsObjectFunctionCall *c); bool functionCurrentId(KviKvsObjectFunctionCall *c); void redirect(QString &file,const QHttpResponseHeader &r); - + #ifndef QT_NO_OPENSSL bool functionIgnoreSslErrors(KviKvsObjectFunctionCall *c); bool functionSslErrorsEvent(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index c50b989f0..153bd23f4 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -454,7 +454,7 @@ KVSO_CLASS_FUNCTION(lineedit,setCompleter) CHECK_INTERNAL_POINTER(widget()) QStringList szCompletionList; QString szMode; - KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szMode) KVSO_PARAMETER("completion_list",KVS_PT_STRINGLIST,0,szCompletionList) KVSO_PARAMETERS_END(c) diff --git a/src/modules/objects/class_listwidget.h b/src/modules/objects/class_listwidget.h index 78fffcc36..8b0f6fbfc 100644 --- a/src/modules/objects/class_listwidget.h +++ b/src/modules/objects/class_listwidget.h @@ -38,7 +38,7 @@ public: QWidget * widget() { return (QWidget *)object(); };
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
-
+
bool insertItem(KviKvsObjectFunctionCall *c);
bool changeItem(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 103cc1d64..58e93488a 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -54,7 +54,7 @@ Load into memorybuffer the <file_name> file. !fn: $saveToFile(<file_name:string>) Save the memorybuffer to <file_name> file. - + */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_memorybuffer,"memorybuffer","object") diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index f2f5b2d3e..0f2ef158c 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -250,14 +250,14 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) /* KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertLine", functionInsertLine) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"removeLine", functionRemoveLine) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertAt", functionInsertAt) - + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setCursorPosition", functionSetCursorPosition) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setWordWrap", functionSetWordWrap) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"wordWrap", functionWordWrap) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"length", functionLength); KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"indent", functionundoDepth) - + */ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"atEnd", functionAtEnd) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"numLines", functionNumLines) @@ -284,7 +284,7 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) //->Zoom In, Out, To KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomIn", functionzoomIn) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomOut", functionzoomOut) - + //->Undo & Redo KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"undo", functionundo) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"redo", functionredo) @@ -297,7 +297,7 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) //->Text color & others KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setText", functionsetText) /* - + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setColor", functionsetColor) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setModified" , functionsetModified) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setLinkUnderline" , functionsetLinkUnderline) @@ -320,10 +320,10 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"paragraphLength" , functionparagraphLength) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertParagraph" , functioninsertParagraph) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"removeParagraph" , functionremoveParagraph) - - + + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"linesOfParagraph" , functionlinesOfParagraph) - + */ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"lineOfChar" , functionlineOfChar) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"lines" ,functionlines) @@ -526,7 +526,7 @@ bool KviKvsObject_textedit::functionsetWrapPolicy(KviKvsObjectFunctionCall * c) else if(KviQString::equalCI(szPolicy,"AtWordBoundaryOrAnywhere")) ((QTextEdit *)widget())->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); else c->warning(__tr2qs_ctx("Unknown wrap policy'%Q'","objects"),&szPolicy); -*/ +*/ return true; } diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h index 721b36438..f595ad304 100644 --- a/src/modules/objects/class_multilineedit.h +++ b/src/modules/objects/class_multilineedit.h @@ -59,7 +59,7 @@ protected: bool functionCopy(KviKvsObjectFunctionCall *c); bool functionPaste(KviKvsObjectFunctionCall *c); bool functionCut(KviKvsObjectFunctionCall *c); -// |-G&N add-| +// |-G&N add-| bool functionsetItalic(KviKvsObjectFunctionCall *c); bool functionitalic(KviKvsObjectFunctionCall *c); bool functionsetBold(KviKvsObjectFunctionCall *c); @@ -75,12 +75,12 @@ protected: bool functionindent(KviKvsObjectFunctionCall *c); bool functionsetUndoRedoEnabled(KviKvsObjectFunctionCall *c); bool functionisUndoRedoEnabled(KviKvsObjectFunctionCall *c); - + bool functionsetText(KviKvsObjectFunctionCall *c); bool functionsetHtmlText(KviKvsObjectFunctionCall *c); bool functionsetPlainText(KviKvsObjectFunctionCall *c); - - + + bool functionsetPointSize(KviKvsObjectFunctionCall *c); bool functionsetColor(KviKvsObjectFunctionCall *c); bool functionisUndoAvailable(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 8bdbae9fd..e78990906 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -462,7 +462,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,translate) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,reset) - + // ?? KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setOpacity) @@ -471,7 +471,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setSmoothPixmapTransform) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBackGroundMode) - + // QPainterPath stuff KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPath) @@ -479,7 +479,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathAddText) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathMoveTo) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathLineTo) - + // Pen KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenJoinStyle) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenCapStyle) @@ -1018,7 +1018,7 @@ KVSO_CLASS_FUNCTION(painter,fontMetricsHeight) CHECK_INTERNAL_POINTER(m_pPainter) if (m_pPainter->isActive()) c->returnValue()->setInteger(m_pPainter->fontMetrics().height()); - else + else c->warning(__tr2qs_ctx("$fontMetricsHeight: the painter is not active!","objects")); return true; } diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/class_painter.h index 173ecba8e..4177423d0 100644 --- a/src/modules/objects/class_painter.h +++ b/src/modules/objects/class_painter.h @@ -48,7 +48,7 @@ protected: public: bool setFont(KviKvsObjectFunctionCall *c); bool setFontSize(KviKvsObjectFunctionCall *c); - + bool fontAscent(KviKvsObjectFunctionCall *c); bool fontDescent(KviKvsObjectFunctionCall *c); bool fontMetricsWidth(KviKvsObjectFunctionCall *c); @@ -69,7 +69,7 @@ public: bool drawText(KviKvsObjectFunctionCall *c); bool drawPixmap(KviKvsObjectFunctionCall *c); - + bool begin(KviKvsObjectFunctionCall *c); bool end(KviKvsObjectFunctionCall *c); @@ -111,7 +111,7 @@ public: bool resetPath(KviKvsObjectFunctionCall *c); bool beginPdf(KviKvsObjectFunctionCall *c); - + bool painterDeviceWidth(KviKvsObjectFunctionCall *c); bool painterDeviceHeight(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index 49838eca5..b05e7c40b 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -47,7 +47,7 @@ class KviKvsObject_socket : public KviKvsObject public: KVSO_DECLARE_OBJECT(KviKvsObject_socket) protected: - bool m_bUdp; + bool m_bUdp; kvi_socket_t m_sock; int m_iStatus; QString m_szRemoteIp; diff --git a/src/modules/objects/class_spinbox.h b/src/modules/objects/class_spinbox.h index f2fc57f14..0c96eb90e 100644 --- a/src/modules/objects/class_spinbox.h +++ b/src/modules/objects/class_spinbox.h @@ -54,9 +54,9 @@ protected: bool lineStep(KviKvsObjectFunctionCall *c); bool setSpecialValueText(KviKvsObjectFunctionCall *c); bool specialValueText(KviKvsObjectFunctionCall *c); - + bool valueChangedEvent(KviKvsObjectFunctionCall *c); - + protected slots: void valueChanged(int); }; diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp index b6a29b8cb..a08e88868 100644 --- a/src/modules/objects/class_sql.cpp +++ b/src/modules/objects/class_sql.cpp @@ -424,7 +424,7 @@ KVSO_CLASS_FUNCTION(sql,queryBindValue) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bindName",KVS_PT_STRING,0,szFieldName) KVSO_PARAMETER("value",KVS_PT_VARIANT,0,v) - KVSO_PARAMETERS_END(c) + KVSO_PARAMETERS_END(c) QString szType; v->getTypeName(szType); if (v->isString()|| v->isNothing()) diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index 1319778d2..587e31f34 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -34,7 +34,7 @@ // Tables used in $setAlignment & $alignment const char * const align_tbl[] = { - "Left", + "Left", "Right", "HCenter", "VCenter", @@ -82,8 +82,8 @@ const int align_cod[] = { !fn: $addStretch(<stretch:integer>) Adds a stretchable space with zero minimum size and stretch factor stretch to the end of this box layout. !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) - Sets the alignment for widget w to flags, given as parameters. - Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center + Sets the alignment for widget w to flags, given as parameters. + Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center */ @@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(vbox,setAlignment) int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) { - + align = 0; for(unsigned int j = 0; j < align_num; j++) { @@ -198,7 +198,7 @@ KVSO_CLASS_FUNCTION(vbox,setAlignment) sum = sum | align; else c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); - + } if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 5d7623b3f..168524764 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1228,7 +1228,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) } else { - QColor color; + QColor color; if (c->params()->count()==1) { if(pColArray->isString()) @@ -1239,7 +1239,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) color.setNamedColor(szColor); if (!color.isValid()) { - // itsn't a color name: let try with an hex triplette + // itsn't a color name: let try with an hex triplette color.setNamedColor("#"+szColor); if (!color.isValid()) { @@ -1251,7 +1251,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) else { c->warning(__tr2qs_ctx("Not a valid color !","objects")); return true; - } + } QPalette p = widget()->palette(); p.setColor(widget()->foregroundRole(), color); widget()->setPalette(p); @@ -1310,7 +1310,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) } else { - QColor color; + QColor color; if (c->params()->count()==1) { if(pColArray->isString()) @@ -1321,7 +1321,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) color.setNamedColor(szColor); if (!color.isValid()) { - // itsn't a color name: let try with an hex triplette + // itsn't a color name: let try with an hex triplette color.setNamedColor("#"+szColor); if (!color.isValid()) { @@ -1333,7 +1333,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) else { c->warning(__tr2qs_ctx("Not a valid color !","objects")); return true; - } + } QPalette p = widget()->palette(); p.setColor(widget()->backgroundRole(), color); widget()->setPalette(p); diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index cf173a90c..036b581a5 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -57,7 +57,7 @@ protected: // setEnabled.. // ... etc // so the name of the C++ function matches exactly the name of the KVS function at this point - + // let's also try to keep alphabetic order for the functions here.. so one can find them quickly bool addWidgetToWrappedLayout(KviKvsObjectFunctionCall *c); @@ -133,7 +133,7 @@ class KviKvsWidget : public QWidget Q_PROPERTY(QSize sizeHint READ sizeHint) public: KviKvsWidget(KviKvsObject_widget * ob,QWidget * par); - + virtual ~KviKvsWidget(); protected: diff --git a/src/modules/objects/class_xmlreader.h b/src/modules/objects/class_xmlreader.h index 340dee907..ea2d9cafc 100644 --- a/src/modules/objects/class_xmlreader.h +++ b/src/modules/objects/class_xmlreader.h @@ -36,10 +36,10 @@ public: public: bool parse(KviKvsObjectFunctionCall *c); bool lastError(KviKvsObjectFunctionCall *c); - + void fatalError(const QString &szError); protected: - QString m_szLastError; + QString m_szLastError; }; #endif //!_CLASS_XMLREADER_H_ diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index 35a2bbc9b..4ef19acbd 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -35,12 +35,12 @@ ~__className(); \ static void registerSelf(); \ static void unregisterSelf(); - + #define SET_OBJECT(__className) \ __className *obj=new __className(parentScriptWidget()); \ obj->setObjectName(getName()); \ setObject(obj,true); - + #define KVSO_REGISTER_HANDLER(__className,__szName,__proc) \ g_pKvs##__className##Class->registerFunctionHandler(__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); |
