diff options
Diffstat (limited to 'src/modules')
94 files changed, 197 insertions, 178 deletions
diff --git a/src/modules/about/Makefile.am b/src/modules/about/Makefile.am index 4192c119..bc1654d5 100644 --- a/src/modules/about/Makefile.am +++ b/src/modules/about/Makefile.am @@ -11,7 +11,7 @@ libkviabout_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviabout_la_SOURCES = libkviabout.cpp aboutdialog.cpp -libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviabout_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= aboutdialog.h diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 540a7fb3..1d4eb9ff 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -130,7 +130,7 @@ KviAboutDialog::KviAboutDialog() TQString szLicense; TQString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc index c35fc173..6e5c0b16 100644 --- a/src/modules/about/abouttext.inc +++ b/src/modules/about/abouttext.inc @@ -1,4 +1,4 @@ -static char * g_szAboutText = "" \ +static const char *g_szAboutText = "" \ "<html>" \ "<head>" \ "<title>Honor and glory</title>" \ diff --git a/src/modules/about/mkabouttext.pl b/src/modules/about/mkabouttext.pl index 0b58a42c..482bae72 100644 --- a/src/modules/about/mkabouttext.pl +++ b/src/modules/about/mkabouttext.pl @@ -70,7 +70,7 @@ sub p open(OUT,">abouttext.inc") or die "Can't open abouttext.inc"; -print OUT "static char * g_szAboutText = \"\" \\\n"; +print OUT "static const char * g_szAboutText = \"\" \\\n"; p "<html>"; p " <head>"; diff --git a/src/modules/action/Makefile.am b/src/modules/action/Makefile.am index 2015e908..f765fa25 100644 --- a/src/modules/action/Makefile.am +++ b/src/modules/action/Makefile.am @@ -11,7 +11,7 @@ libkviaction_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaction_la_SOURCES = libkviaction.cpp -libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaction_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= actiondialog.h diff --git a/src/modules/actioneditor/Makefile.am b/src/modules/actioneditor/Makefile.am index 84ce9dd7..57291a7d 100644 --- a/src/modules/actioneditor/Makefile.am +++ b/src/modules/actioneditor/Makefile.am @@ -13,7 +13,7 @@ libkviactioneditor_la_SOURCES = libkviactioneditor.cpp actioneditor.cpp nodist_libkviactioneditor_la_SOURCES = moc_actioneditor.cpp noinst_HEADERS = actioneditor.h -libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviactioneditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 608a90e5..02729582 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon() TQString s = d->selectedImage(); delete d; if(ret != TQDialog::Accepted)return; - TQPixmap * p = g_pIconManager->getImage(s.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(s); if(!p)return; m_pSmallIconEdit->setText(s); m_pSmallIconButton->setPixmap(*p); diff --git a/src/modules/addon/Makefile.am b/src/modules/addon/Makefile.am index e232b8ff..c822520f 100644 --- a/src/modules/addon/Makefile.am +++ b/src/modules/addon/Makefile.am @@ -14,7 +14,7 @@ libkviaddon_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviaddon_la_SOURCES = libkviaddon.cpp managementdialog.cpp nodist_libkviaddon_la_SOURCES = moc_managementdialog.cpp -libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviaddon_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h diff --git a/src/modules/aliaseditor/Makefile.am b/src/modules/aliaseditor/Makefile.am index 60845dbc..223b8d5d 100644 --- a/src/modules/aliaseditor/Makefile.am +++ b/src/modules/aliaseditor/Makefile.am @@ -13,7 +13,7 @@ libkvialiaseditor_la_SOURCES = libkvialiaseditor.cpp aliaseditor.cpp nodist_libkvialiaseditor_la_SOURCES = moc_aliaseditor.cpp noinst_HEADERS = aliaseditor.h -libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvialiaseditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/avatar/Makefile.am b/src/modules/avatar/Makefile.am index 8e8a793a..bb5050e3 100644 --- a/src/modules/avatar/Makefile.am +++ b/src/modules/avatar/Makefile.am @@ -12,7 +12,7 @@ libkviavatar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviavatar_la_SOURCES = libkviavatar.cpp nodist_libkviavatar_la_SOURCES = moc_libkviavatar.cpp -libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviavatar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = libkviavatar.h diff --git a/src/modules/chan/Makefile.am b/src/modules/chan/Makefile.am index 620836ac..312f12b1 100644 --- a/src/modules/chan/Makefile.am +++ b/src/modules/chan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvichan.la libkvichan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichan_la_SOURCES = libkvichan.cpp -libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvichan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/channelsjoin/Makefile.am b/src/modules/channelsjoin/Makefile.am index c9f8a78e..48466890 100644 --- a/src/modules/channelsjoin/Makefile.am +++ b/src/modules/channelsjoin/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvichannelsjoin.la libkvichannelsjoin_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvichannelsjoin_la_SOURCES = libkvichannelsjoin.cpp channelsjoinwindow.cpp -libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvichannelsjoin_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= channelsjoinwindow.h diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 57c31930..33664177 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -174,10 +174,10 @@ void KviChannelsJoinWindow::fillListView() par = new KviTalListViewItem(m_pListView,__tr2qs("Registered Channels")); par->setOpen(true); - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); if(d) { - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(it.current()) { chld = new KviTalListViewItem(par,it.currentKey()); diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index bf0a6816..3ae0d0ba 100644 --- a/src/modules/clock/Makefile.am +++ b/src/modules/clock/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviclock.la libkviclock_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviclock_la_SOURCES = libkviclock.cpp -libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviclock_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviclock.h diff --git a/src/modules/codetester/Makefile.am b/src/modules/codetester/Makefile.am index 37540094..45afbd4f 100644 --- a/src/modules/codetester/Makefile.am +++ b/src/modules/codetester/Makefile.am @@ -9,7 +9,7 @@ libkvicodetester_la_SOURCES = libkvicodetester.cpp codetester.cpp nodist_libkvicodetester_la_SOURCES = moc_codetester.cpp noinst_HEADERS = codetester.h -libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicodetester_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/config/Makefile.am b/src/modules/config/Makefile.am index 1a43c2e9..78310a2e 100644 --- a/src/modules/config/Makefile.am +++ b/src/modules/config/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviconfig.la libkviconfig_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviconfig_la_SOURCES = libkviconfig.cpp -libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviconfig_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/context/Makefile.am b/src/modules/context/Makefile.am index e4ec3252..a303fc0d 100644 --- a/src/modules/context/Makefile.am +++ b/src/modules/context/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvicontext.la libkvicontext_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvicontext_la_SOURCES = libkvicontext.cpp -libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvicontext_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/dcc/Makefile.am b/src/modules/dcc/Makefile.am index 8a63b888..ef262f8a 100644 --- a/src/modules/dcc/Makefile.am +++ b/src/modules/dcc/Makefile.am @@ -34,7 +34,7 @@ libkvidcc_la_SOURCES = adpcmcodec.cpp \ voice.cpp \ window.cpp -libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidcc_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= adpcmcodec.h \ broker.h \ diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index a766f932..7131e233 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -576,7 +576,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath)) { g_pMediaManager->lock(); - if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName.utf8().data(),false)) + if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName,false)) { if(mt->szSavePath.hasData()) { diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index bf8a9192..1d5b284b 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -1132,7 +1132,7 @@ static dccParseProcEntry dccParseProcTable[KVI_NUM_KNOWN_DCC_TYPES]= // We want C linkage on this one: we want to be able to dlsym() it with a simple name // FIXME: Is this portable enough ? Or is better to have a table entry ? -KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc) +extern "C" KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc) { dcc->szType.toUpper(); diff --git a/src/modules/dialog/Makefile.am b/src/modules/dialog/Makefile.am index 06018a14..4ed9e9fa 100644 --- a/src/modules/dialog/Makefile.am +++ b/src/modules/dialog/Makefile.am @@ -11,7 +11,7 @@ libkvidialog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvidialog_la_SOURCES = libkvidialog.cpp -libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidialog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidialog.h diff --git a/src/modules/dockwidget/Makefile.am b/src/modules/dockwidget/Makefile.am index f0411021..c1c4da56 100644 --- a/src/modules/dockwidget/Makefile.am +++ b/src/modules/dockwidget/Makefile.am @@ -13,7 +13,7 @@ libkvidockwidget_la_SOURCES = libkvidockwidget_qt3.cpp #nodist_libkvidockwidget_la_SOURCES = moc_trayicon.cpp -libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvidockwidget_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvidockwidget.h libkvidockwidget_qt3.h diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index bf7baaeb..c2f0a269 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -88,7 +88,7 @@ #endif #endif -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0; static TQPixmap * g_pDock1 = 0; @@ -104,10 +104,10 @@ static TQPixmap * g_pDock3 = 0; KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) : TQWidget(0,name) { - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; m_pFlashingTimer = new TQTimer(this,"flashing_timer"); connect( m_pFlashingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flashingTimerShot()) ); @@ -380,7 +380,7 @@ void KviDockWidget::doAway(int id) { if(id<0) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -425,7 +425,7 @@ void KviDockWidget::fillContextPopup() int iSeparator=m_pAwayPopup->insertSeparator(); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); bool bAllAway=1; bool bAllUnaway=1; int iNetCount=0; @@ -491,13 +491,13 @@ void KviDockWidget::refresh() // how to copy transparency???? delete g_pCurrentPixmap; g_pCurrentPixmap=new TQPixmap(16,16); - bitBlt(g_pCurrentPixmap,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,0,8,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); - bitBlt(g_pCurrentPixmap,8,8,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,0,8,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,8,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,0,8,8,TQt::ClearROP); + bitBlt(g_pCurrentPixmap,8,8,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,8,8,8,8,TQt::ClearROP); #endif - if( (m_iChannels == 2) || (m_iQueries == 2) ) + if( (m_uChannels == 2) || (m_uQueries == 2) ) { if(!m_pFlashingTimer->isActive() && KVI_OPTION_BOOL(KviOption_boolEnableTrayIconFlashing) ) m_pFlashingTimer->start(1000); } else { @@ -528,56 +528,56 @@ void KviDockWidget::grabActivityInfo() KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)=KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage); } - m_iConsoles = 0; - m_iChannels = 0; - m_iQueries = 0; - m_iOther = 0; + m_uConsoles = 0; + m_uChannels = 0; + m_uQueries = 0; + m_uOther = 0; for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem()) { if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - int iLevel = b->highlightLevel(); + unsigned int uLevel = static_cast<unsigned int>(b->highlightLevel()); switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } else { - int iLevel=0; + int uLevel=0; if(b->kviWindow()->view()) { if(b->kviWindow()->view()->haveUnreadedHighlightedMessages()) { - iLevel=2; + uLevel=2; } else if(b->kviWindow()->view()->haveUnreadedMessages()) { - iLevel=1; + uLevel=1; } - if(iLevel>0) + if(uLevel>0) switch(b->kviWindow()->type()) { case KVI_WINDOW_TYPE_CONSOLE: - if(m_iConsoles < iLevel) m_iConsoles = iLevel; + if(m_uConsoles < uLevel) m_uConsoles = uLevel; break; case KVI_WINDOW_TYPE_CHANNEL: - if(m_iChannels < iLevel) m_iChannels = iLevel; + if(m_uChannels < uLevel) m_uChannels = uLevel; break; case KVI_WINDOW_TYPE_QUERY: - if(m_iQueries < iLevel) m_iQueries = iLevel; + if(m_uQueries < uLevel) m_uQueries = uLevel; break; default: - if(m_iOther < iLevel) m_iOther = iLevel; + if(m_uOther < uLevel) m_uOther = uLevel; break; } } @@ -586,21 +586,21 @@ void KviDockWidget::grabActivityInfo() if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification)) { - if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2; - else if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1; - else m_iConsoles=0; + if(m_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uConsoles=2; + else if(m_uConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uConsoles=1; + else m_uConsoles=0; - if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2; - else if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1; - else m_iChannels=0; + if(m_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uChannels=2; + else if(m_uChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uChannels=1; + else m_uChannels=0; - if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2; - else if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1; - else m_iQueries=0; + if(m_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uQueries=2; + else if(m_uQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uQueries=1; + else m_uQueries=0; - if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2; - else if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1; - else m_iOther=0; + if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_uOther=2; + else if(m_uOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_uOther=1; + else m_uOther=0; } } @@ -611,10 +611,10 @@ void KviDockWidget::paintEvent(TQPaintEvent * event) erase(); bitBlt(this,4,4,g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE),0,0,16,16); } else { - bitBlt(this,0,0,m_iOther ? ((m_iOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); - bitBlt(this,0,12,m_iConsoles ? ((m_iConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); - bitBlt(this,12,0,m_iQueries ? ((m_iQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); - bitBlt(this,12,12,m_iChannels ? ((m_iChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); + bitBlt(this,0,0,m_uOther ? ((m_uOther == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,0,12,12,TQt::CopyROP,false); + bitBlt(this,0,12,m_uConsoles ? ((m_uConsoles == 2) ? g_pDock3 : g_pDock2) : g_pDock1,0,12,12,12,TQt::CopyROP,false); + bitBlt(this,12,0,m_uQueries ? ((m_uQueries == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,0,12,12,TQt::CopyROP,false); + bitBlt(this,12,12,m_uChannels ? ((m_uChannels == 2) ? g_pDock3 : g_pDock2) : g_pDock1,12,12,12,12,TQt::CopyROP,false); } } diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.h b/src/modules/dockwidget/libkvidockwidget_qt3.h index 2ec3c268..4259ce66 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.h +++ b/src/modules/dockwidget/libkvidockwidget_qt3.h @@ -60,10 +60,10 @@ protected: bool m_bFlashed; TQTimer* m_pFlashingTimer; - int m_iConsoles; - int m_iChannels; - int m_iQueries; - int m_iOther; + unsigned int m_uConsoles; + unsigned int m_uChannels; + unsigned int m_uQueries; + unsigned int m_uOther; public: KviFrame * frame(){ return m_pFrm; }; public: diff --git a/src/modules/editor/Makefile.am b/src/modules/editor/Makefile.am index beb22541..11a48111 100644 --- a/src/modules/editor/Makefile.am +++ b/src/modules/editor/Makefile.am @@ -11,7 +11,7 @@ libkvieditor_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) nodist_libkvieditor_la_SOURCES = moc_scripteditor.cpp libkvieditor_la_SOURCES = libkvieditor.cpp scripteditor.cpp -libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvieditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= scripteditor.h diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp index e265a8ff..faa14c81 100644 --- a/src/modules/editor/libkvieditor.cpp +++ b/src/modules/editor/libkvieditor.cpp @@ -83,12 +83,12 @@ KVIRC_MODULE( // We want C linkage on this one: we want to be able to dlsym() it with a simple name // FIXME: Is this portable enough ? Or is better to have a table entry ? -KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(TQWidget * par) +extern "C" KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(TQWidget * par) { return new KviScriptEditorImplementation(par); } -KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e) +extern "C" KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e) { delete ((KviScriptEditorImplementation *)e); } diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 68a70d3f..62a49307 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -458,7 +458,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const { TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]"); - //tqDebug("BUFFER IS %s",buffer.utf8().data()); + //tqDebug("BUFFER IS %s",buffer.local8Bit().data()); int start = buffer.findRev(re,index); int end = buffer.find(re,index); @@ -471,7 +471,7 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const tmp = buffer.mid(start,end-start); } buffer = tmp; - //tqDebug("BUFFER NOW IS %s",buffer.utf8().data()); + //tqDebug("BUFFER NOW IS %s",buffer.local8Bit().data()); } void KviScriptEditorWidget::completition(bool bCanComplete) diff --git a/src/modules/eventeditor/Makefile.am b/src/modules/eventeditor/Makefile.am index ceb7541a..afb12e43 100644 --- a/src/modules/eventeditor/Makefile.am +++ b/src/modules/eventeditor/Makefile.am @@ -13,7 +13,7 @@ libkvieventeditor_la_SOURCES = libkvieventeditor.cpp eventeditor.cpp nodist_libkvieventeditor_la_SOURCES = moc_eventeditor.cpp noinst_HEADERS = eventeditor.h -libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvieventeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index 06d6e3e2..6b58280c 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -193,7 +193,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventListViewItem *it,TQString &buf if(KviTQString::equalCI(newName,ch->m_szName)) { bFound = true; - KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx); + KviTQString::sprintf(newName,"%Q_%d",&buffer,idx); idx++; break; } diff --git a/src/modules/file/Makefile.am b/src/modules/file/Makefile.am index 1545a63a..f1b70abd 100644 --- a/src/modules/file/Makefile.am +++ b/src/modules/file/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvifile.la libkvifile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifile_la_SOURCES = libkvifile.cpp -libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvifile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 2b29e007..c15a030c 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -835,8 +835,10 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) if(iCount>0) { for(; (iCount>0 && !stream.atEnd()) ; iCount-- ) + { a->set(iIndex,new KviKvsVariant(stream.readLine())); iIndex++; + } } else { while(!stream.atEnd()) { a->set(iIndex,new KviKvsVariant(stream.readLine())); diff --git a/src/modules/filetransferwindow/Makefile.am b/src/modules/filetransferwindow/Makefile.am index 910d86b4..372c0f1b 100644 --- a/src/modules/filetransferwindow/Makefile.am +++ b/src/modules/filetransferwindow/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvifiletransferwindow.la libkvifiletransferwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvifiletransferwindow_la_SOURCES = libkvifiletransferwindow.cpp filetransferwindow.cpp -libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvifiletransferwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= filetransferwindow.h diff --git a/src/modules/help/Makefile.am b/src/modules/help/Makefile.am index fe6f03f6..36e130af 100644 --- a/src/modules/help/Makefile.am +++ b/src/modules/help/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvihelp.la libkvihelp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihelp_la_SOURCES = libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp index.moc -libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvihelp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= helpwidget.h helpwindow.h index.h diff --git a/src/modules/http/Makefile.am b/src/modules/http/Makefile.am index ab7fe3b2..728e3235 100644 --- a/src/modules/http/Makefile.am +++ b/src/modules/http/Makefile.am @@ -16,7 +16,7 @@ pluglib_LTLIBRARIES = libkvihttp.la libkvihttp_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvihttp_la_SOURCES = libkvihttp.cpp httpfiletransfer.cpp -libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvihttp_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= httpfiletransfer.h diff --git a/src/modules/ident/Makefile.am b/src/modules/ident/Makefile.am index c02c0b47..71bf0e9b 100644 --- a/src/modules/ident/Makefile.am +++ b/src/modules/ident/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviident.la libkviident_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviident_la_SOURCES = libkviident.cpp -libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviident_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviident.h diff --git a/src/modules/iograph/Makefile.am b/src/modules/iograph/Makefile.am index a9ea3928..8d10a3cf 100644 --- a/src/modules/iograph/Makefile.am +++ b/src/modules/iograph/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviiograph.la libkviiograph_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviiograph_la_SOURCES = libkviiograph.cpp -libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviiograph_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviiograph.h diff --git a/src/modules/lamerizer/Makefile.am b/src/modules/lamerizer/Makefile.am index ce798e5c..164a6523 100644 --- a/src/modules/lamerizer/Makefile.am +++ b/src/modules/lamerizer/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilamerizer.la libkvilamerizer_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilamerizer_la_SOURCES = libkvilamerizer.cpp -libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilamerizer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvilamerizer.h diff --git a/src/modules/links/Makefile.am b/src/modules/links/Makefile.am index 51eea094..9ca4c085 100644 --- a/src/modules/links/Makefile.am +++ b/src/modules/links/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilinks.la libkvilinks_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilinks_la_SOURCES = libkvilinks.cpp linkswindow.cpp -libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilinks_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= linkswindow.h diff --git a/src/modules/list/Makefile.am b/src/modules/list/Makefile.am index 52290210..bb75d337 100644 --- a/src/modules/list/Makefile.am +++ b/src/modules/list/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilist.la libkvilist_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilist_la_SOURCES = libkvilist.cpp listwindow.cpp -libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilist_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= listwindow.h diff --git a/src/modules/log/Makefile.am b/src/modules/log/Makefile.am index e2bfe1e9..52703f8f 100644 --- a/src/modules/log/Makefile.am +++ b/src/modules/log/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvilog.la libkvilog_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilog_la_SOURCES = libkvilog.cpp -libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilog_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/logview/Makefile.am b/src/modules/logview/Makefile.am index 03a1b07e..36dfce6c 100644 --- a/src/modules/logview/Makefile.am +++ b/src/modules/logview/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvilogview.la libkvilogview_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvilogview_la_SOURCES = libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp -libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvilogview_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= logviewwidget.h logviewmdiwindow.h diff --git a/src/modules/mask/Makefile.am b/src/modules/mask/Makefile.am index 0ca529fe..1cd18470 100644 --- a/src/modules/mask/Makefile.am +++ b/src/modules/mask/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimask.la libkvimask_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimask_la_SOURCES = libkvimask.cpp -libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimask_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/math/Makefile.am b/src/modules/math/Makefile.am index 001bef24..bfaaaafa 100644 --- a/src/modules/math/Makefile.am +++ b/src/modules/math/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimath.la libkvimath_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimath_la_SOURCES = libkvimath.cpp -libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimath_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am index 41e5b850..97e03ca3 100644 --- a/src/modules/mediaplayer/Makefile.am +++ b/src/modules/mediaplayer/Makefile.am @@ -22,7 +22,7 @@ libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \ mp_winampinterface.cpp \ mp_xmmsinterface.cpp -libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimediaplayer_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = mp_amarokinterface.h \ mp_amipinterface.h \ diff --git a/src/modules/mircimport/Makefile.am b/src/modules/mircimport/Makefile.am index d47e88c7..5bd59ac1 100644 --- a/src/modules/mircimport/Makefile.am +++ b/src/modules/mircimport/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvimircimport.la libkvimircimport_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimircimport_la_SOURCES = libkvimircimport.cpp -libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimircimport_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvimircimport.h diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 96b74cf1..858675d3 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -355,7 +355,7 @@ static bool mircimport_module_can_unload(KviModule * m) } /* -KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) +extern "C" KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName) { if(kvi_strEqualCI(filterName,__tr("Import from servers.ini"))) { diff --git a/src/modules/my/Makefile.am b/src/modules/my/Makefile.am index 4c179e48..c3d31944 100644 --- a/src/modules/my/Makefile.am +++ b/src/modules/my/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimy.la libkvimy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvimy_la_SOURCES = libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp -libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvimy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= idle.h diff --git a/src/modules/notifier/Makefile.am b/src/modules/notifier/Makefile.am index 59639aca..8fb5cbca 100644 --- a/src/modules/notifier/Makefile.am +++ b/src/modules/notifier/Makefile.am @@ -19,7 +19,7 @@ libkvinotifier_la_SOURCES = libkvinotifier.cpp \ notifierwindowborder.cpp \ notifierwindowprogressbar.cpp -libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvinotifier_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= \ notifiersettings.h \ diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index faf10ba6..dd178cc3 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent() void KviNotifierWindowTab::setPrevMessageAsCurrent() { if(!m_pCurrentMessage)return; - if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return; + if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return; m_pCurrentMessage = m_pMessageList->prev(); if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first(); } 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); diff --git a/src/modules/options/Makefile.am b/src/modules/options/Makefile.am index 53c0988c..9fe8b0c4 100644 --- a/src/modules/options/Makefile.am +++ b/src/modules/options/Makefile.am @@ -57,7 +57,7 @@ libkvioptions_la_SOURCES = libkvioptions.cpp \ optw_userlist.cpp \ optw_tray.cpp -libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvioptions_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= container.h \ dialog.h \ diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 4dd17505..f19138ea 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -333,7 +333,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt if(!szText.isEmpty()) { bool bOk = true; - for(int j=0;j<lKeywords.count();j++) + for(size_t j=0;j<lKeywords.count();j++) { if(szText.find(*(lKeywords.at(j)),0,false) == -1) { diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h index 561f4874..99955cf4 100644 --- a/src/modules/options/instances.h +++ b/src/modules/options/instances.h @@ -61,7 +61,6 @@ typedef struct _KviOptionsWidgetInstanceEntry class KviOptionsInstanceManager : public TQObject { TQ_OBJECT - public: KviOptionsInstanceManager(); virtual ~KviOptionsInstanceManager(); diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index fc915ed4..b44a498b 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -30,6 +30,10 @@ #include <tqdir.h> #include <tqmessagebox.h> +#include <algorithm> +#include <filesystem> +#include <vector> + TQString g_szPrevSettedLocale; KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) @@ -82,15 +86,29 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent) TQString szLocaleDir; g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale); - TQStringList list=TQDir(szLocaleDir).entryList("kvirc_*.mo",TQDir::Files); - + // Find available translations by checking for existance of kvirc.mo files + namespace fs = std::filesystem; + std::vector<fs::path> translationPaths; + const fs::path localeDir { szLocaleDir.local8Bit().data() }; + for (const auto &dir : fs::directory_iterator(localeDir)) + { + if (!dir.is_directory()) + { + continue; + } + + if (fs::exists(dir.path()/"LC_MESSAGES/kvirc.mo")) + { + translationPaths.push_back(dir.path().filename()); + } + } + std::sort(translationPaths.begin(), translationPaths.end()); + i = 0; iMatch = 0; - - for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - TQString szTmp=*it; - szTmp.replace("kvirc_",""); - szTmp.replace(".mo",""); + for (const auto &filename : translationPaths) + { + TQString szTmp { filename.c_str() }; m_pForcedLocaleCombo->insertItem(szTmp); if(KviTQString::equalCI(szTmp,m_szLanguage)) iMatch = i + 2; diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index f9c24501..3973fab9 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -79,7 +79,7 @@ void KviTextIconEditor::chooseFromFile() if(g_pIconManager->getPixmap(szFile)) { m_pIcon->setFilename(szFile); -// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().utf8().data(),m_pIcon); +// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().local8Bit().data(),m_pIcon); updateIcon(); } } diff --git a/src/modules/perl/Makefile.am b/src/modules/perl/Makefile.am index ea5e4a5b..7f6f2d8b 100644 --- a/src/modules/perl/Makefile.am +++ b/src/modules/perl/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperl.la libkviperl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviperl_la_SOURCES = libkviperl.cpp -libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/perlcore/Makefile.am b/src/modules/perlcore/Makefile.am index a153262c..f4f555e0 100644 --- a/src/modules/perlcore/Makefile.am +++ b/src/modules/perlcore/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviperlcore.la libkviperlcore_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_PERL_LDFLAGS) libkviperlcore_la_SOURCES = libkviperlcore.cpp -libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviperlcore_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = perlcoreinterface.h diff --git a/src/modules/popupeditor/Makefile.am b/src/modules/popupeditor/Makefile.am index a9e2f1d7..4770ecd8 100644 --- a/src/modules/popupeditor/Makefile.am +++ b/src/modules/popupeditor/Makefile.am @@ -9,7 +9,7 @@ libkvipopupeditor_la_SOURCES = libkvipopupeditor.cpp popupeditor.cpp nodist_libkvipopupeditor_la_SOURCES = moc_popupeditor.cpp noinst_HEADERS = popupeditor.h -libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvipopupeditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/raweditor/Makefile.am b/src/modules/raweditor/Makefile.am index 74c64e9b..07ba37b3 100644 --- a/src/modules/raweditor/Makefile.am +++ b/src/modules/raweditor/Makefile.am @@ -9,7 +9,7 @@ libkviraweditor_la_SOURCES = libkviraweditor.cpp raweditor.cpp nodist_libkviraweditor_la_SOURCES = moc_raweditor.cpp noinst_HEADERS = raweditor.h -libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviraweditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index a1221d73..9b3662c6 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -196,7 +196,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawListViewItem *it,TQString &buffer) if(KviTQString::equalCI(newName,ch->m_szName)) { bFound = true; - KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx); + KviTQString::sprintf(newName,"%Q_%d",&buffer,idx); idx++; break; } diff --git a/src/modules/regchan/Makefile.am b/src/modules/regchan/Makefile.am index c46f64aa..5f7d5479 100644 --- a/src/modules/regchan/Makefile.am +++ b/src/modules/regchan/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviregchan.la libkviregchan_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviregchan_la_SOURCES = libkviregchan.cpp -libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviregchan_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= edituser.h diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index fe38cf34..a8b29de7 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -170,7 +170,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c) { if(!szValue.isEmpty()) { - ch->setProperty(szProperty.utf8().data(),new KviStr(szValue)); + ch->setProperty(szProperty,new KviStr(szValue)); } else { ch->removeProperty(szProperty); } @@ -199,7 +199,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) int tot = 0; - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * ch = l->first();ch;ch = l->next()) @@ -207,7 +207,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) tot++; c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Channel: %c%s@%s"), KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr()); - KviPointerHashTableIterator<const char *,KviStr> pit(*(ch->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(ch->propertyDict())); while(KviStr * s = pit.current()) { c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" Property: %s=%s"),pit.currentKey(),s->ptr()); @@ -259,8 +259,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c) if(szChan.isEmpty())szChan="*"; if(szNetmask.isEmpty())szNetmask="*"; - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(KviRegisteredChannelList * l = it.current()) { diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am index 93aea872..1fd16912 100644 --- a/src/modules/reguser/Makefile.am +++ b/src/modules/reguser/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvireguser.la libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp -libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvireguser_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= edituser.h wizard.h dialog.h nodist_libkvireguser_la_SOURCES = moc_dialog.cpp diff --git a/src/modules/rijndael/Makefile.am b/src/modules/rijndael/Makefile.am index 69b2fe01..3a46a300 100644 --- a/src/modules/rijndael/Makefile.am +++ b/src/modules/rijndael/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvirijndael.la libkvirijndael_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvirijndael_la_SOURCES = libkvirijndael.cpp rijndael.cpp ablowfish.cpp -libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvirijndael_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvirijndael.h rijndael.h ablowfish.h diff --git a/src/modules/setup/Makefile.am b/src/modules/setup/Makefile.am index 73e3bcec..7634b3fc 100644 --- a/src/modules/setup/Makefile.am +++ b/src/modules/setup/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisetup.la libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp -libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= setupwizard.h diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 33184cc1..af8e0360 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -53,7 +53,7 @@ TQString szMircIni; // this is called by KviApp when no local kvirc directory has been found // we have nothing to rely on yet... (settings have not been loaded yet) -KVIMODULEEXPORTFUNC bool setup_begin() +extern "C" KVIMODULEEXPORTFUNC bool setup_begin() { // FIXME: try to guess the user's .kvirc directory // and the preferred nickname from a previous installation @@ -69,7 +69,7 @@ KVIMODULEEXPORTFUNC bool setup_begin() // all the subsystems are up and running (we even have a nice console // to write on if needed). // all the options are loaded. -KVIMODULEEXPORTFUNC void setup_finish() +extern "C" KVIMODULEEXPORTFUNC void setup_finish() { if(bNeedToApplyDefaults) { diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index b08de956..3cf36461 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -191,7 +191,7 @@ KviSetupWizard::KviSetupWizard() ed->setWordWrap(KviTalTextEdit::NoWrap); TQString szLicense; TQString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr("Oops... can't find the license file.\n" \ diff --git a/src/modules/sharedfile/Makefile.am b/src/modules/sharedfile/Makefile.am index 5c4ace3b..013c24bf 100644 --- a/src/modules/sharedfile/Makefile.am +++ b/src/modules/sharedfile/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisharedfile.la libkvisharedfile_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfile_la_SOURCES = libkvisharedfile.cpp -libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisharedfile_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= sharedfilewindow.h diff --git a/src/modules/sharedfileswindow/Makefile.am b/src/modules/sharedfileswindow/Makefile.am index f43e1e67..ce0a79df 100644 --- a/src/modules/sharedfileswindow/Makefile.am +++ b/src/modules/sharedfileswindow/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkvisharedfileswindow.la libkvisharedfileswindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisharedfileswindow_la_SOURCES = libkvisharedfileswindow.cpp sharedfileswindow.cpp -libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisharedfileswindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= sharedfileswindow.h diff --git a/src/modules/snd/Makefile.am b/src/modules/snd/Makefile.am index 09e193a6..10e1110a 100644 --- a/src/modules/snd/Makefile.am +++ b/src/modules/snd/Makefile.am @@ -11,7 +11,7 @@ pluglib_LTLIBRARIES = libkvisnd.la libkvisnd_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisnd_la_SOURCES = libkvisnd.cpp -libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisnd_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvisnd.h diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index d508ed39..1c3b61f9 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -434,7 +434,7 @@ void KviSoundThread::run() if(!f.open(IO_ReadOnly)) { - tqDebug("Could not open sound file %s! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not open sound file %s! [OSS]",m_szFileName.local8Bit().data()); return; } @@ -442,13 +442,13 @@ void KviSoundThread::run() if(iSize < 24) { - tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } if(f.readBlock(buf,24) < 24) { - tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } @@ -472,7 +472,7 @@ void KviSoundThread::run() int iReaded = f.readBlock(buf + iDataLen,iToRead); if(iReaded < 1) { - tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } iSize -= iReaded; @@ -485,7 +485,7 @@ void KviSoundThread::run() { if((errno != EINTR) && (errno != EAGAIN)) { - tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } } @@ -519,7 +519,7 @@ void KviSoundThread::run() { // ESD has a really nice API if(!esd_play_file(NULL,m_szFileName.utf8().data(),1)) - tqDebug("Could not play sound %s! [ESD]",m_szFileName.utf8().data()); + tqDebug("Could not play sound %s! [ESD]",m_szFileName.local8Bit().data()); } #endif //COMPILE_ESD_SUPPORT @@ -542,7 +542,7 @@ void KviSoundThread::run() Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer")); if(server->isNull()) { - tqDebug("Can't connect to sound server to play file %s",m_szFileName.utf8().data()); + tqDebug("Can't connect to sound server to play file %s",m_szFileName.local8Bit().data()); } else { server->play(m_szFileName); } diff --git a/src/modules/socketspy/Makefile.am b/src/modules/socketspy/Makefile.am index 7e0a4b6b..66bf2266 100644 --- a/src/modules/socketspy/Makefile.am +++ b/src/modules/socketspy/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisocketspy.la libkvisocketspy_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisocketspy_la_SOURCES = libkvisocketspy.cpp socketspywindow.cpp -libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisocketspy_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= socketspywindow.h diff --git a/src/modules/spaste/Makefile.am b/src/modules/spaste/Makefile.am index 3912fbfe..1de6b360 100644 --- a/src/modules/spaste/Makefile.am +++ b/src/modules/spaste/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvispaste.la libkvispaste_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvispaste_la_SOURCES = libkvispaste.cpp controller.cpp -libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvispaste_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= controller.h libkvispaste.h diff --git a/src/modules/str/Makefile.am b/src/modules/str/Makefile.am index 7fe7e93a..1557f046 100644 --- a/src/modules/str/Makefile.am +++ b/src/modules/str/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvistr.la libkvistr_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvistr_la_SOURCES = libkvistr.cpp -libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvistr_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index e372f75a..810bf345 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -1085,8 +1085,8 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - char * toReplace[]={" ", "#", "$", "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"}; - char * newStr[]={"%20", "%23", "%24", "&", "%2F", "%3A", "<", "%3D", ">", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"}; + const char *toReplace[]={" ", "#", "$", "&", "/", ":", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"}; + const char *newStr[]={"%20", "%23", "%24", "&", "%2F", "%3A", "<", "%3D", ">", "%3F", "%40", "%5B", "%5C", "%5D", "%5E", "%60", "%7B", "%7C", "%7D", "%7E"}; /* for(int idx=0,idx<22,idx++) @@ -1428,7 +1428,7 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c) } int idx = 0; - int cnt = 0; + kvs_uint_t cnt = 0; int begin; int len = szString.length(); while (idx<len) diff --git a/src/modules/system/Makefile.am b/src/modules/system/Makefile.am index 69302d13..19d452f9 100644 --- a/src/modules/system/Makefile.am +++ b/src/modules/system/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisystem.la libkvisystem_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisystem_la_SOURCES = libkvisystem.cpp plugin.cpp -libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisystem_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = plugin.h diff --git a/src/modules/term/Makefile.am b/src/modules/term/Makefile.am index 1567e615..f7a7e279 100644 --- a/src/modules/term/Makefile.am +++ b/src/modules/term/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkviterm.la libkviterm_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviterm_la_SOURCES = libkviterm.cpp termwidget.cpp termwindow.cpp -libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviterm_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= termwidget.h termwindow.h diff --git a/src/modules/texticons/Makefile.am b/src/modules/texticons/Makefile.am index 77646abd..447d85dd 100644 --- a/src/modules/texticons/Makefile.am +++ b/src/modules/texticons/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitexticons.la libkvitexticons_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitexticons_la_SOURCES = libkvitexticons.cpp -libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitexticons_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/theme/Makefile.am b/src/modules/theme/Makefile.am index 5417e9e5..079c436b 100644 --- a/src/modules/theme/Makefile.am +++ b/src/modules/theme/Makefile.am @@ -19,7 +19,7 @@ nodist_libkvitheme_la_SOURCES = moc_managementdialog.cpp \ moc_packthemedialog.cpp \ moc_savethemedialog.cpp -libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitheme_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= managementdialog.h \ packthemedialog.h \ diff --git a/src/modules/tip/Makefile.am b/src/modules/tip/Makefile.am index 2a9fbbcb..37be4b04 100644 --- a/src/modules/tip/Makefile.am +++ b/src/modules/tip/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitip.la libkvitip_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitip_la_SOURCES = libkvitip.cpp -libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitip_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkvitip.h diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 911a3f9f..67afa62f 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -204,7 +204,7 @@ void KviTipWindow::nextTip() KviStr tmp(KviStr::Format,"%u",uNextTip); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>")); - //tqDebug("REDECODED=%s",szTip.utf8().data()); + //tqDebug("REDECODED=%s",szTip.local8Bit().data()); uNextTip++; if(uNextTip >= uNumTips)uNextTip = 0; diff --git a/src/modules/tmphighlight/Makefile.am b/src/modules/tmphighlight/Makefile.am index b35caea8..1a9c1461 100644 --- a/src/modules/tmphighlight/Makefile.am +++ b/src/modules/tmphighlight/Makefile.am @@ -13,7 +13,7 @@ pluglib_LTLIBRARIES = libkvitmphighlight.la libkvitmphighlight_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitmphighlight_la_SOURCES = libkvitmphighlight.cpp -libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitmphighlight_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la #noinst_HEADERS= diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp index b69b7998..af13415b 100644 --- a/src/modules/tmphighlight/libkvitmphighlight.cpp +++ b/src/modules/tmphighlight/libkvitmphighlight.cpp @@ -56,7 +56,7 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; @@ -133,7 +133,7 @@ static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSM_PARAMETERS_END(c) if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext(); - if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL) + if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) { c->warning(__tr2qs("Current window is not a channel")); return false; diff --git a/src/modules/toolbar/Makefile.am b/src/modules/toolbar/Makefile.am index e009e306..445235f2 100644 --- a/src/modules/toolbar/Makefile.am +++ b/src/modules/toolbar/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitoolbar.la libkvitoolbar_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvitoolbar_la_SOURCES = libkvitoolbar.cpp -libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbar_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la # noinst_HEADERS= diff --git a/src/modules/toolbareditor/Makefile.am b/src/modules/toolbareditor/Makefile.am index a578e10c..9b05887a 100644 --- a/src/modules/toolbareditor/Makefile.am +++ b/src/modules/toolbareditor/Makefile.am @@ -14,7 +14,7 @@ libkvitoolbareditor_la_SOURCES = libkvitoolbareditor.cpp toolbareditor.cpp nodist_libkvitoolbareditor_la_SOURCES = moc_toolbareditor.cpp noinst_HEADERS = toolbareditor.h -libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitoolbareditor_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la moc_toolbareditor.cpp: toolbareditor.h $(SS_QT_MOC) $< -o $@ diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1f..c33ba952 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -199,7 +199,7 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog() void KviCustomToolBarPropertiesDialog::iconSelected(const TQString &szIconId) { - TQPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(szIconId); if(p) { m_pIconButton->setPixmap(*p); diff --git a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am index fff58478..5325de6b 100644 --- a/src/modules/torrent/Makefile.am +++ b/src/modules/torrent/Makefile.am @@ -17,7 +17,7 @@ libkvitorrent_la_SOURCES = libkvitorrent.cpp \ tc_ktorrentdcopinterface.cpp \ tc_statusbarapplet.cpp -libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvitorrent_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS = tc_interface.h \ tc_ktorrentdcopinterface.h \ diff --git a/src/modules/url/Makefile.am b/src/modules/url/Makefile.am index c2d88957..ab6d4a29 100644 --- a/src/modules/url/Makefile.am +++ b/src/modules/url/Makefile.am @@ -12,7 +12,7 @@ pluglib_LTLIBRARIES = libkviurl.la libkviurl_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkviurl_la_SOURCES = libkviurl.cpp -libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviurl_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= libkviurl.h icons.h diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am index 52912925..2ee70e4d 100644 --- a/src/modules/window/Makefile.am +++ b/src/modules/window/Makefile.am @@ -13,7 +13,7 @@ nodist_libkviwindow_la_SOURCES = moc_userwindow.cpp libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp -libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= userwindow.h diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 3624402d..ee82b9c9 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -54,7 +54,7 @@ // kvi_app.cpp -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; KviPointerList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type @@ -71,7 +71,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ { \ if(!c->hasSwitch('q',"quiet")) \ @@ -90,7 +90,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ return true; \ } @@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviTQString::equalCI(szType,"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -882,7 +882,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts and also "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -903,7 +903,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // only "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -1104,7 +1104,7 @@ static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c) KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1150,7 +1150,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1195,7 +1195,7 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1268,7 +1268,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c) KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0, szBackground) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1401,7 +1401,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) if(szDecryptKey.isEmpty())szDecryptKey = szEncryptKey; #ifdef COMPILE_CRYPT_SUPPORT - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) |