diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_multilineedit.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_pixmap.cpp | 6 | ||||
| -rw-r--r-- | src/modules/objects/class_wrapper.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_xmlreader.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/objects/Makefile.am b/src/modules/objects/Makefile.am index c4574582..a5a81aa6 100644 --- a/src/modules/objects/Makefile.am +++ b/src/modules/objects/Makefile.am @@ -53,7 +53,7 @@ libkviobjects_la_SOURCES = libkviobjects.cpp \ class_hbox.cpp -libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviobjects_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= class_button.h \ class_buttongroup.h \ diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index ac8ce39d..7348fa62 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -42,7 +42,7 @@ //->Tables for Text Format -static char * const mod_tbl[] = { +static const char *const mod_tbl[] = { "PlainText", "RichText", "AutoText", @@ -410,7 +410,7 @@ bool KviKvsObject_mledit::functionInsertAt(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine < 0 || iCol < 0 || iLine > ((KviTalMultiLineEdit *)widget())->numLines()) + if(iLine < 0 || iCol < 0 || iLine > static_cast<kvs_uint_t>(((KviTalMultiLineEdit *)widget())->numLines())) c->warning("No such line number"); else ((KviTalMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol); diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index e5c7223d..f9891f0b 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -223,7 +223,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) if (bPixmapModified) { *m_pImage=m_pPixmap->convertToImage(); } - if (uWidth>buffer->width() || uHeight>buffer->height()) + if (uWidth>static_cast<kvs_uint_t>(buffer->width()) || uHeight>static_cast<kvs_uint_t>(buffer->height())) { c->warning(__tr2qs("Area dimensions are out of destination size ")); return true; @@ -246,12 +246,12 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) } -if(uXoffset+uWidth>m_pImage->width()) +if(uXoffset+uWidth>static_cast<kvs_uint_t>(m_pImage->width())) { c->warning(__tr2qs("Offset width area is out of pixmap size ")); return true; } - if( uYoffset+uHeight>m_pImage->height()) + if( uYoffset+uHeight>static_cast<kvs_uint_t>(m_pImage->height())) { c->warning(__tr2qs("Offset height area is out of pixmap size ")); return true; diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 74dcc8f9..53bcb264 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis tqDebug ("ci sono i parametri"); TQWidget *pWidget = 0; - int i=0; + unsigned int i=0; while(i!=pParams->count()) { TQString szClass; diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index dfeea0c5..a897f9f2 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) TQByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); - //tqDebug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); + //tqDebug("PARSING(%s) LEN(%d)",szString.local8Bit().data(),szString.local8Bit().length()); TQXmlSimpleReader reader; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); |