aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Robert Förster2014-06-01 09:49:28 +0000
committerGravatar Robert Förster2014-06-01 09:49:28 +0000
commite3ecdd9668a23916f6820caafa79291ed842601a (patch)
tree563b7dcadce7a777531cd4174dc1d46a5c3ed6ca
parentPatch for a perl weirdness in a macro spaghetti that worksaround the error: (diff)
downloadKVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.tar.gz
KVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.tar.bz2
KVIrc-e3ecdd9668a23916f6820caafa79291ed842601a.zip
- added qt5 phonon support (windows doesn't seem to work, others were not tested yet)
- fixed tabs in plist - wrapped #warning into __GNUC__ ifdef - partly revert r6370 the change was quite pointless - update to ExtUtils::ParseXS 3.24 and Devel::PPPort 3.24, also adding a define which the latter suggested - massive update to the numeric table, no function change, some of these make sense to implement, some don't, this commit is merely to complete the listing so i can figure something out, possibly git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6381 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--CMakeLists.txt36
-rw-r--r--data/resources_mac/Info.plist.in8
-rw-r--r--src/kvirc/kernel/KviIconManager.cpp4
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_tables.cpp606
-rw-r--r--src/kvirc/ui/KviInputEditor.cpp2
-rw-r--r--src/kvirc/ui/KviMainWindow.cpp8
-rw-r--r--src/modules/objects/KvsObject_ftp.cpp4
-rw-r--r--src/modules/objects/KvsObject_http.cpp4
-rw-r--r--src/modules/perlcore/libkviperlcore.cpp3
-rw-r--r--src/modules/perlcore/ppport.h114
-rw-r--r--src/modules/perlcore/xs.inc2
11 files changed, 453 insertions, 338 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 920e8a7d8..a4c5506a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -631,16 +631,28 @@ endif()
# Phonon support
option(WANT_PHONON "Whether to compile Phonon support" ON)
if(WANT_PHONON)
- find_package(Phonon)
- if(PHONON_FOUND AND NOT Qt5Multimedia_FOUND)
- set(COMPILE_PHONON_SUPPORT 1)
- list(APPEND LIBS ${PHONON_LIBRARY})
- list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Phonon")
- elseif(Qt5Multimedia_FOUND)
- list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Qt5Multimedia")
+ if(WANT_QT4)
+ find_package(Phonon)
+ if(PHONON_FOUND)
+ set(COMPILE_PHONON_SUPPORT 1)
+ list(APPEND LIBS ${PHONON_LIBRARY})
+ list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Phonon")
+ endif()
+ else()
+ find_package(Phonon4Qt5 NO_MODULE)
+ if(Phonon4Qt5_FOUND)
+ set(COMPILE_PHONON_SUPPORT 1)
+ list(APPEND LIBS ${PHONON_LIBRARY})
+ list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Phonon")
+ endif()
endif()
endif()
+# this is a no-op - not nice i know, but real no point in making it optional...
+if(Qt5Multimedia_FOUND AND NOT WANT_QT4)
+ list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Qt5Multimedia")
+endif()
+
# esd
option(WANT_ESD "Whether to compile ESD support" ON)
if(WANT_ESD)
@@ -806,7 +818,7 @@ endif()
option(WANT_PYTHON "Compile Python Support" ON)
if(WANT_PYTHON)
# this should ensure that cmake prefers python 2.7 over python 3
- # it's not neede from cmake 2.8.8 onwards
+ # it's not needed from cmake 2.8.8 onwards
set(Python_ADDITIONAL_VERSIONS 2.7)
find_package(PythonLibs)
if(PYTHONLIBS_FOUND)
@@ -985,7 +997,6 @@ else()
set(CMAKE_STATUS_MEMORY_PROFILE_SUPPORT "No")
endif()
-
############################################################################
# Memory checks support
############################################################################
@@ -1115,13 +1126,6 @@ else()
set(CMAKE_STATUS_GETTEXT_SUPPORT "No")
endif()
-
-#Unused by now
-#CMakeUnixFindMake.cmake
-#FindCygwin.cmake
-#CMakeFindXCode.cmake
-#CheckLibraryExists.cmake
-
# Search for subdirectories; under osx, data _MUST_ be before src (to get Info.plist installed before the main executable's fixup_bundle step)
subdirs(data doc po scripts src)
diff --git a/data/resources_mac/Info.plist.in b/data/resources_mac/Info.plist.in
index e79e73a12..994dc0f69 100644
--- a/data/resources_mac/Info.plist.in
+++ b/data/resources_mac/Info.plist.in
@@ -12,18 +12,18 @@
<array>
<string>en</string>
<string>bg</string>
- <string>ca</string>
+ <string>ca</string>
<string>cs</string>
<string>de</string>
<string>es</string>
<string>fr</string>
- <string>hu</string>
+ <string>hu</string>
<string>it</string>
<string>nl</string>
<string>pl</string>
<string>pt</string>
- <string>pt_BR</string>
- <string>ru</string>
+ <string>pt_BR</string>
+ <string>ru</string>
<string>sr</string>
<string>uk</string>
</array>
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index e62c077fe..4000693e2 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -1260,7 +1260,9 @@ QPixmap * KviIconManager::loadSmallIcon(int iIdx)
return m_smallIcons[iIdx];
}
-#warning IMPLEMENT CLEANUP
+#ifdef __GNUC__
+ #warning IMPLEMENT CLEANUP
+#endif
/*
void KviIconManager::cacheCleanup()
{
diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
index 441c729be..fe8617dcb 100644
--- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
@@ -93,19 +93,19 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumeric002) , // 002 RPL_YOURHOST
PTM(parseNumeric003) , // 003 RPL_CREATED
PTM(parseNumeric004) , // 004 RPL_MYINFO
- PTM(parseNumeric005) , // 005 RPL_BOUNCE, RPL_PROTOCTL
- 0, // 006
- 0, // 007
- 0, // 008
- 0, // 009
- 0, // 010
+ PTM(parseNumeric005) , // 005 RPL_BOUNCE, RPL_PROTOCTL, RPL_ISUPPORT
+ 0, // 006 RPL_MAP
+ 0, // 007 RPL_MAPEND
+ 0, // 008 RPL_SNOMASK
+ 0, // 009 RPL_STATMEMTOT
+ 0, // 010 RPL_BOUNCE, RPL_REDIR, RPL_STATMEM
0, // 011
0, // 012
0, // 013
- 0, // 014
- 0, // 015
- 0, // 016
- 0, // 017
+ 0, // 014 RPL_YOURCOOKIE
+ 0, // 015 RPL_MAP
+ 0, // 016 RPL_MAPMORE
+ 0, // 017 RPL_MAPEND
0, // 018
0, // 019
PTM(parseNumeric020) , // 020
@@ -130,16 +130,16 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 039
0, // 040
0, // 041
- 0, // 042
- 0, // 043
+ 0, // 042 RPL_YOURID
+ 0, // 043 RPL_SAVENICK
0, // 044
0, // 045
0, // 046
0, // 047
0, // 048
0, // 049
- 0, // 050
- 0, // 051
+ 0, // 050 RPL_ATTEMPTINGJUNC
+ 0, // 051 RPL_ATTEMPTINGREROUTE
0, // 052
0, // 053
0, // 054
@@ -288,45 +288,45 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 197
0, // 198
0, // 199
- 0, // 200
- 0, // 201
- 0, // 202
- 0, // 203
- 0, // 204
- 0, // 205
- 0, // 206
- 0, // 207
- 0, // 208
- 0, // 209
- 0, // 210
- 0, // 211
- 0, // 212
- 0, // 213
- 0, // 214
- 0, // 215
- 0, // 216
- 0, // 217
- 0, // 218
+ 0, // 200 RPL_TRACELINK
+ 0, // 201 RPL_TRACECONNECTING
+ 0, // 202 RPL_TRACEHANDSHAKE
+ 0, // 203 RPL_TRACEUNKNOWN
+ 0, // 204 RPL_TRACEOPERATOR
+ 0, // 205 RPL_TRACEUSER
+ 0, // 206 RPL_TRACESERVER
+ 0, // 207 RPL_TRACESERVICE
+ 0, // 208 RPL_TRACENEWTYPE
+ 0, // 209 RPL_TRACECLASS
+ 0, // 210 RPL_TRACERECONNECT, RPL_STATS
+ 0, // 211 RPL_STATSLINKINFO
+ 0, // 212 RPL_STATSCOMMANDS
+ 0, // 213 RPL_STATSCLINE
+ 0, // 214 RPL_STATSNLINE
+ 0, // 215 RPL_STATSILINE
+ 0, // 216 RPL_STATSKLINE
+ 0, // 217 RPL_STATSQLINE, RPL_STATSPLINE
+ 0, // 218 RPL_STATSYLINE
PTM(parseNumericEndOfStats), // 219 RPL_ENDOFSTATS
- 0, // 220
+ 0, // 220 RPL_STATSPLINE, RPL_STATSBLINE
PTM(parseNumericUserMode) , // 221 RPL_UMODEIS
- PTM(parseNumericCodePageSet), // 222 RusNet Codepage set
- 0, // 223
- 0, // 224
- 0, // 225
- 0, // 226
- 0, // 227
- 0, // 228
+ PTM(parseNumericCodePageSet), // 222 RusNet Codepage set, RPL_MODLIST, RPL_SQLINE_NICK, RPL_STATSBLINE
+ 0, // 223 RPL_STATSELINE, RPL_STATSGLINE
+ 0, // 224 RPL_STATSFLINE, RPL_STATSTLINE
+ 0, // 225 RPL_STATSDLINE, RPL_STATSZLINE, RPL_STATSELINE
+ 0, // 226 RPL_STATSCOUNT, RPL_STATSNLINE
+ 0, // 227 RPL_STATSGLINE, RPL_STATSVLINE
+ 0, // 228 RPL_STATSQLINE
0, // 229
0, // 230
- 0, // 231
- 0, // 232
- 0, // 233
- 0, // 234
- 0, // 235
- 0, // 236
- 0, // 237
- 0, // 238
+ 0, // 231 RPL_SERVICEINFO
+ 0, // 232 RPL_ENDOFSERVICES, RPL_RULES
+ 0, // 233 RPL_SERVICE
+ 0, // 234 RPL_SERVLIST
+ 0, // 235 RPL_SERVLISTEND
+ 0, // 236 RPL_STATSVERBOSE
+ 0, // 237 RPL_STATSENGINE
+ 0, // 238 RPL_STATSFLINE
PTM(parseNumericStats) , // 239 RPL_STATSIAUTH
PTM(parseNumericStats) , // 240 RPL_STATSVLINE
PTM(parseNumericStats) , // 241 RPL_STATSLLINE
@@ -349,55 +349,55 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumericServerAdminInfoAdminName) , // 258 RPL_ADMINLOC2
PTM(parseNumericServerAdminInfoAdminContact) , // 259 RPL_ADMINEMAIL
0, // 260
- 0, // 261
- 0, // 262
- 0, // 263
+ 0, // 261 RPL_TRACELOG
+ 0, // 262 RPL_TRACEPING, RPL_TRACEEND
+ 0, // 263 RPL_TRYAGAIN
0, // 264
PTM(parseNumericStats) , // 265 RPL_LOCALUSERS
PTM(parseNumericStats) , // 266 RPL_GLOBALUSERS
- PTM(parseNumericStats) , // 267 RPL_SHAREDUSERS
- 0, // 268
- 0, // 269
- 0, // 270
- 0, // 271
- 0, // 272
- 0, // 273
- 0, // 274
- PTM(parseNumericWhoisOther) , // 275 RPL_WHOISSSL
- 0, // 276
- 0, // 277
- 0, // 278
+ PTM(parseNumericStats) , // 267 RPL_SHAREDUSERS, RPL_START_NETSTAT
+ 0, // 268 RPL_NETSTAT
+ 0, // 269 RPL_END_NETSTAT
+ 0, // 270 RPL_PRIVS, RPL_MAPUSERS
+ 0, // 271 RPL_SILELIST
+ 0, // 272 RPL_ENDOFSILELIST
+ 0, // 273 RPL_NOTIFY
+ 0, // 274 RPL_ENDOFNOTIFY, RPL_STATSDELTA
+ PTM(parseNumericWhoisOther) , // 275 RPL_WHOISSSL, RPL_STATSDLINE
+ 0, // 276 RPL_VCHANEXIST
+ 0, // 277 RPL_VCHANLIST
+ 0, // 278 RPL_VCHANHELP
0, // 279
- 0, // 280
- 0, // 281
- 0, // 282
- 0, // 283
- 0, // 284
- 0, // 285
- 0, // 286
- 0, // 287
- 0, // 288
- 0, // 289
- 0, // 290
- 0, // 291
- 0, // 292
- 0, // 293
- 0, // 294
- 0, // 295
- 0, // 296
+ 0, // 280 RPL_GLIST
+ 0, // 281 RPL_ENDOFGLIST, RPL_ACCEPTLIST
+ 0, // 282 RPL_ENDOFACCEPT, RPL_JUPELIST
+ 0, // 283 RPL_ALIST, RPL_ENDOFJUPELIST
+ 0, // 284 RPL_ENDOFALIST, RPL_FEATURE
+ 0, // 285 RPL_FEATURE, RPL_CHANINFO_HANDLE
+ 0, // 286 RPL_CHANINFO_USERS, RPL_CHKHEAD
+ 0, // 287 RPL_CHANINFO_CHOPS, RPL_CHANUSER
+ 0, // 288 RPL_CHANINFO_VOICES, RPL_PATCHHEAD
+ 0, // 289 RPL_CHANINFO_AWAY, RPL_PATCHCON
+ 0, // 290 RPL_CHANINFO_OPERS, RPL_HELPHDR, RPL_DATASTR
+ 0, // 291 RPL_CHANINFO_BANNED, RPL_HELPOP, RPL_ENDOFCHECK
+ 0, // 292 RPL_CHANINFO_BANS, RPL_HELPTLR
+ 0, // 293 RPL_CHANINFO_INVITE, RPL_HELPHLP
+ 0, // 294 RPL_CHANINFO_INVITES, RPL_HELPFWD
+ 0, // 295 RPL_CHANINFO_KICK, RPL_HELPIGN
+ 0, // 296 RPL_CHANINFO_KICKS
0, // 297
0, // 298
- 0, // 299
- 0, // 300
- PTM(parseNumericWhoisAway) , // 301
+ 0, // 299 RPL_END_CHANINFO
+ 0, // 300 RPL_NONE
+ PTM(parseNumericWhoisAway) , // 301 RPL_AWAY
PTM(parseNumericUserhost) , // 302 RPL_USERHOST
PTM(parseNumericIsOn) , // 303 RPL_ISON
- 0, // 304
+ 0, // 304 RPL_TEXT, RPL_SYNTAX
PTM(parseNumericBackFromAway) , // 305 RPL_UNAWAY
PTM(parseNumericAway) , // 306 RPL_NOWAWAY
PTM(parseNumericWhoisAuth) , // 307 RPL_WHOISREGNICK
- PTM(parseNumericWhoisOther) , // 308 RPL_WHOISADMIN
- PTM(parseNumericWhoisOther) , // 309 RPL_WHOISSADMIN
+ PTM(parseNumericWhoisOther) , // 308 RPL_WHOISADMIN, RPL_RULESTART
+ PTM(parseNumericWhoisOther) , // 309 RPL_WHOISSADMIN, RPL_RULESEND
PTM(parseNumericWhoisOther) , // 310 RPL_WHOISHELPOP
PTM(parseNumericWhoisUser) , // 311 RPL_WHOISUSER
PTM(parseNumericWhoisServer) , // 312 RPL_WHOISSERVER
@@ -413,24 +413,24 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumericList) , // 322 RPL_LIST
PTM(parseNumericListEnd) , // 323 RPL_LISTEND
PTM(parseNumericChannelModeIs) , // 324 RPL_CHANNELMODEIS
- 0, // 325
- 0, // 326
- 0, // 327
- PTM(parseNumericChanUrl) , // 328 RPL_CHANURL
- PTM(parseNumericCreationTime) , // 329 RPL_CREATIONTIME
+ 0, // 325 RPL_UNIQOPIS, RPL_CHANNELPASSIS
+ 0, // 326 RPL_NOCHANPASS
+ 0, // 327 RPL_CHPASSUNKNOWN
+ PTM(parseNumericChanUrl) , // 328 RPL_CHANNEL_URL
+ PTM(parseNumericCreationTime) , // 329 RPL_CREATIONTIME, RPL_CHANNELCREATED
PTM(parseNumericWhoisAuth) , // 330 RPL_WHOISAUTH
- PTM(parseNumericNoTopic) , // 331 RPL_NOTOPIC
+ PTM(parseNumericNoTopic) , // 331 RPL_NOTOPIC, RPL_NOTOPICSET
PTM(parseNumericTopic) , // 332 RPL_TOPIC
- PTM(parseNumericTopicWhoTime) , // 333 RPL_TOPICWHOTIME
+ PTM(parseNumericTopicWhoTime) , // 333 RPL_TOPICWHOTIME, RPL_TOPICTIME
PTM(parseNumericCommandSyntax) , // 334 RPL_COMMANDSYNTAX
- 0, // 335
+ 0, // 335 RPL_WHOISBOT
0, // 336
0, // 337
- PTM(parseNumericWhoisActually), // 338 RPL_WHOISACTUALLY
- PTM(parseNumericWhoisOther), // 339
- 0, // 340
- PTM(parseNumericInviting) , // 351 RPL_INVITING
- 0, // 342
+ PTM(parseNumericWhoisActually), // 338 RPL_WHOISACTUALLY, RPL_CHANPASSOK
+ PTM(parseNumericWhoisOther), // 339 RPL_BADCHANPASS
+ 0, // 340 RPL_USERIP
+ PTM(parseNumericInviting) , // 341 RPL_INVITING
+ 0, // 342 RPL_SUMMONING
0, // 343
PTM(parseNumericReopList) , // 344 RPL_REOPLIST
PTM(parseNumericEndOfReopList) , // 345 RPL_ENDOFREOPLIST
@@ -439,19 +439,19 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumericExceptList) , // 348 RPL_EXCEPTLIST
PTM(parseNumericEndOfExceptList) , // 349 RPL_ENDOFEXCEPTLIST
0, // 350
- 0, // 351
+ 0, // 351 RPL_VERSION
PTM(parseNumericWhoReply) , // 352 RPL_WHOREPLY
PTM(parseNumericNames) , // 353 RPL_NAMREPLY
- 0, // 354
- 0, // 355
+ 0, // 354 RPL_WHOSPCRPL
+ 0, // 355 RPL_NAMREPLY_
0, // 356
- 0, // 357
- 0, // 358
- 0, // 359
+ 0, // 357 RPL_MAP
+ 0, // 358 RPL_MAPMORE
+ 0, // 359 RPL_MAPEND
0, // 360
- 0, // 361
- 0, // 362
- 0, // 363
+ 0, // 361 RPL_KILLDONE
+ 0, // 362 RPL_CLOSING
+ 0, // 363 RPL_CLOSEEND
PTM(parseNumericLinks) , // 364 RPL_LINKS
PTM(parseNumericEndOfLinks) , // 365 RPL_ENDOFLINKS
PTM(parseNumericEndOfNames) , // 366 RPL_ENDOFNAMES
@@ -465,161 +465,161 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumericInfoEnd) , // 374 RPL_ENDOFINFO
PTM(parseNumericMotd) , // 375 RPL_MOTDSTART
PTM(parseNumericMotd) , // 376 RPL_ENDOFMOTD
- PTM(parseNumericMotd) , // 377 RPL_MOTD2
- PTM(parseNumericWhoisOther) , // 378 RPL_WHOISHOST
- 0, // 379
- 0, // 380
- 0, // 381
- 0, // 382
- 0, // 383
- 0, // 384
- 0, // 385
+ PTM(parseNumericMotd) , // 377 RPL_MOTD2, RPL_KICKEXPIRED, RPL_SPAM
+ PTM(parseNumericWhoisOther) , // 378 RPL_WHOISHOST, RPL_BANEXPIRED
+ 0, // 379 RPL_KICKLINKED, RPL_WHOISMODES, RPL_WHOWASIP
+ 0, // 380 RPL_BANLINKED, RPL_YOURHELPER
+ 0, // 381 RPL_YOUREOPER
+ 0, // 382 RPL_REHASHING
+ 0, // 383 RPL_YOURESERVICE
+ 0, // 384 RPL_MYPORTIS
+ 0, // 385 RPL_NOTOPERANYMORE
PTM(parseNumericQList) , // 386 RPL_QLIST
- PTM(parseNumericEndOfQList) , // 387 RPL_ENDOFQLIST
+ PTM(parseNumericEndOfQList) , // 387 RPL_ENDOFQLIST, RPL_ENDOFIRCOPS
PTM(parseNumericAList) , // 388 RPL_ALIST
PTM(parseNumericEndOfAList) , // 389 RPL_ENDOFALIST
0, // 390
PTM(parseNumericTime) , // 391 RPL_TIME
- 0, // 392
- 0, // 393
- 0, // 394
- 0, // 395
- 0, // 396
+ 0, // 392 RPL_USERSSTART
+ 0, // 393 RPL_USERS
+ 0, // 394 RPL_ENDOFUSERS
+ 0, // 395 RPL_NOUSERS
+ 0, // 396 RPL_HOSTHIDDEN, RPL_YOURDISPLAYEDHOST
0, // 397
0, // 398
0, // 399
- 0, // 400
+ 0, // 400 ERR_UNKNOWNERROR
PTM(parseNumericNoSuchNick) , // 401 ERR_NOSUCHNICK
PTM(parseNumericNoSuchServer) , // 402 ERR_NOSUCHSERVER
PTM(parseNumericNoSuchChannel) , // 403 ERR_NOSUCHCHANNEL
PTM(parseNumericCannotSend) , // 404 ERR_CANNOTSENDTOCHAN
- 0, // 405
+ 0, // 405 ERR_TOOMANYCHANNELS
PTM(parseNumericNoSuchNick) , // 406 ERR_WASNOSUCHNICK
- 0, // 407
- PTM(parseNumericCannotSendColor) , // 408 ERR_NOCOLORSONCHAN
- 0, // 409
- 0, // 410
- 0, // 411
- 0, // 412
- 0, // 413
- 0, // 414
- 0, // 415
- 0, // 416
+ 0, // 407 ERR_TOOMANYTARGETS
+ PTM(parseNumericCannotSendColor) , // 408 ERR_NOCOLORSONCHAN, ERR_NOSUCHSERVICE
+ 0, // 409 ERR_NOORIGIN
+ 0, // 410 ERR_INVALIDCAPSUBCOMMAND
+ 0, // 411 ERR_NORECIPIENT
+ 0, // 412 ERR_NOTEXTTOSEND
+ 0, // 413 ERR_NOTOPLEVEL
+ 0, // 414 ERR_WILDTOPLEVEL
+ 0, // 415 ERR_BADMASK
+ 0, // 416 ERR_TOOMANYMATCHES, ERR_QUERYTOOLONG
0, // 417
0, // 418
- 0, // 419
+ 0, // 419 ERR_LENGTHTRUNCATED
0, // 420
- 0, // 421
- 0, // 422
- 0, // 423
- 0, // 424
- 0, // 425
+ 0, // 421 ERR_UNKNOWNCOMMAND
+ 0, // 422 ERR_NOMOTD
+ 0, // 423 ERR_NOADMININFO
+ 0, // 424 ERR_FILEERROR
+ 0, // 425 ERR_NOOPERMOTD
0, // 426
0, // 427
0, // 428
- 0, // 429
- 0, // 430
- 0, // 431
+ 0, // 429 ERR_TOOMANYAWAY
+ 0, // 430 ERR_EVENTNICKCHANGE
+ 0, // 431 ERR_NONICKNAMEGIVEN
PTM(parseNumericNicknameProblem) , // 432 ERR_ERRONEUSNICKNAME
PTM(parseNumericNicknameProblem) , // 433 ERR_NICKNAMEINUSE
- 0, // 434
- 0, // 435
- 0, // 436
- PTM(parseNumericUnavailResource) , // 437 ERR_UNAVAILRESOURCE
- 0, // 438
- 0, // 439
- 0, // 440
- 0, // 441
- 0, // 442
- 0, // 443
- 0, // 444
- 0, // 445
- 0, // 446
- 0, // 447
+ 0, // 434 ERR_SERVICENAMEINUSE, ERR_NORULES
+ 0, // 435 ERR_SERVICECONFUSED, ERR_BANONCHAN
+ 0, // 436 ERR_NICKCOLLISION
+ PTM(parseNumericUnavailResource) , // 437 ERR_UNAVAILRESOURCE, ERR_BANNICKCHANGE
+ 0, // 438 ERR_NICKTOOFAST, ERR_DEAD
+ 0, // 439 ERR_TARGETTOOFAST
+ 0, // 440 ERR_SERVICESDOWN
+ 0, // 441 ERR_USERNOTINCHANNEL
+ 0, // 442 ERR_NOTONCHANNEL
+ 0, // 443 ERR_USERONCHANNEL
+ 0, // 444 ERR_NOLOGIN
+ 0, // 445 ERR_SUMMONDISABLED
+ 0, // 446 ERR_USERSDISABLED
+ 0, // 447 ERR_NONICKCHANGE, ERR_CANTCHANGENICK
0, // 448
- 0, // 449
+ 0, // 449 ERR_NOTIMPLEMENTED
0, // 450
PTM(parseNumericNotRegistered) , // 451 ERR_NOTREGISTERED
- 0, // 452
- 0, // 453
+ 0, // 452 ERR_IDCOLLISION
+ 0, // 453 ERR_NICKLOST
0, // 454
- 0, // 455
- 0, // 456
- 0, // 457
- 0, // 458
- 0, // 459
- 0, // 460
- 0, // 461
- 0, // 462
- 0, // 463
- 0, // 464
- 0, // 465
- 0, // 466
+ 0, // 455 ERR_HOSTILENAME
+ 0, // 456 ERR_ACCEPTFULL
+ 0, // 457 ERR_ACCEPTEXIST
+ 0, // 458 ERR_ACCEPTNOT
+ 0, // 459 ERR_NOHIDING
+ 0, // 460 ERR_NOTFORHALFOPS
+ 0, // 461 ERR_NEEDMOREPARAMS
+ 0, // 462 ERR_ALREADYREGISTERED
+ 0, // 463 ERR_NOPERMFORHOST
+ 0, // 464 ERR_PASSWDMISMATCH
+ 0, // 465 ERR_YOUREBANNEDCREEP
+ 0, // 466 ERR_YOUWILLBEBANNED
PTM(otherChannelError), // 467 ERR_KEYSET
- 0, // 468
- 0, // 469
- 0, // 470
+ 0, // 468 ERR_ONLYSERVERSCANCHANGE
+ 0, // 469 ERR_LINKSET
+ 0, // 470 ERR_LINKCHANNEL, ERR_KICKEDFROMCHAN
PTM(parseNumericCantJoinChannel) , // 471 ERR_CHANNELISFULL
PTM(otherChannelError), // 472 ERR_UNKNOWNMODE
PTM(parseNumericCantJoinChannel) , // 473 ERR_INVITEONLYCHAN
PTM(parseNumericCantJoinChannel) , // 474 ERR_BANNEDFROMCHAN
PTM(parseNumericCantJoinChannel) , // 475 ERR_BADCHANNELKEY
- 0, // 476
+ 0, // 476 ERR_BADCHANMASK
PTM(parseChannelHelp), // 477 RPL_CHANNELHELP
- 0, // 478
- 0, // 479
- 0, // 480
- 0, // 481
+ 0, // 478 ERR_BANLISTFULL
+ 0, // 479 ERR_BADCHANNAME, ERR_LINKFAIL
+ 0, // 480 ERR_NOULINE, ERR_CANNOTKNOCK
+ 0, // 481 ERR_NOPRIVILEGES
PTM(otherChannelError), // 482 ERR_CHANOPRIVSNEEDED
- 0, // 483
- 0, // 484
- 0, // 485
- 0, // 486
- 0, // 487
- 0, // 488
- 0, // 489
- 0, // 490
- 0, // 491
- 0, // 492
- 0, // 493
- 0, // 494
- 0, // 495
- 0, // 496
- 0, // 497
- 0, // 498
- 0, // 499
+ 0, // 483 ERR_CANTKILLSERVER
+ 0, // 484 ERR_RESTRICTED, ERR_ISCHANSERVICE, ERR_DESYNC, ERR_ATTACKDENY
+ 0, // 485 ERR_UNIQOPRIVSNEEDED, ERR_KILLDENY, ERR_CANTKICKADMIN, ERR_ISREALSERVICE
+ 0, // 486 ERR_NONONREG, ERR_HTMDISABLED, ERR_ACCOUNTONLY
+ 0, // 487 ERR_CHANTOORECENT, ERR_MSGSERVICES
+ 0, // 488 ERR_TSLESSCHAN
+ 0, // 489 ERR_VOICENEEDED, ERR_SECUREONLYCHAN
+ 0, // 490 ERR_ALLMUSTSSL
+ 0, // 491 ERR_NOOPERHOST
+ 0, // 492 ERR_NOSERVICEHOST, ERR_NOCTCPALLOWED
+ 0, // 493 ERR_NOFEATURE
+ 0, // 494 ERR_BADFEATURE
+ 0, // 495 ERR_BADLOGTYPE, ERR_DELAYREJOIN
+ 0, // 496 ERR_BADLOGSYS
+ 0, // 497 ERR_BADLOGVALUE
+ 0, // 498 ERR_ISOPERLCHAN
+ 0, // 499 ERR_CHANOWNPRIVNEEDED
0, // 500
- 0, // 501
- 0, // 502
- 0, // 503
- 0, // 504
+ 0, // 501 ERR_UMODEUNKNOWNFLAG, ERR_UNKNOWNSNOMASK
+ 0, // 502 ERR_USERSDONTMATCH
+ 0, // 503 ERR_GHOSTEDCLIENT
+ 0, // 504 ERR_USERNOTONSERV
0, // 505
0, // 506
0, // 507
0, // 508
0, // 509
0, // 510
- 0, // 511
- 0, // 512
- 0, // 513
- 0, // 514
- 0, // 515
- 0, // 516
- 0, // 517
- 0, // 518
- 0, // 519
- 0, // 520
- 0, // 521
- 0, // 522
- 0, // 523
- 0, // 524
- 0, // 525
- 0, // 526
+ 0, // 511 ERR_SILELISTFULL
+ 0, // 512 ERR_TOOMANYWATCH
+ 0, // 513 ERR_BADPING
+ 0, // 514 ERR_INVALID_ERROR, ERR_TOOMANYDCC
+ 0, // 515 ERR_BADEXPIRE
+ 0, // 516 ERR_DONTCHEAT
+ 0, // 517 ERR_DISABLED
+ 0, // 518 ERR_NOINVITE, ERR_LONGMASK
+ 0, // 519 ERR_ADMONLY, ERR_TOOMANYUSERS
+ 0, // 520 ERR_OPERONLY, ERR_MASKTOOWIDE, ERR_WHOTRUNC, ERR_CANTJOINOPERSONLY
+ 0, // 521 ERR_LISTSYNTAX
+ 0, // 522 ERR_WHOSYNTAX
+ 0, // 523 ERR_WHOLIMEXCEED
+ 0, // 524 ERR_QUARANTINED, ERR_OPERSPVERIFY
+ 0, // 525 ERR_REMOTEPFX
+ 0, // 526 ERR_PFXUNROUTABLE
0, // 527
0, // 528
0, // 529
0, // 530
- 0, // 531
+ 0, // 531 ERR_CANTSENDTOUSER
0, // 532
0, // 533
0, // 534
@@ -638,10 +638,10 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 547
0, // 548
0, // 549
- 0, // 550
- 0, // 551
- 0, // 552
- 0, // 553
+ 0, // 550 ERR_BADHOSTMASK
+ 0, // 551 ERR_HOSTUNAVAIL
+ 0, // 552 ERR_USINGSLINE
+ 0, // 553 ERR_STATSSLINE
0, // 554
0, // 555
0, // 556
@@ -696,30 +696,30 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
PTM(parseNumericWatch) , // 605 RPL_NOWOFF
0, // 606 RPL_WATCHLIST
0, // 607 RPL_ENDOFWATCH
- 0, // 608
+ 0, // 608 RPL_WATCHCLEAR
0, // 609
- 0, // 610
- 0, // 611
- 0, // 612
- 0, // 613
+ 0, // 610 RPL_MAPMORE, RPL_ISOPER
+ 0, // 611 RPL_ISLOCOP
+ 0, // 612 RPL_ISNOTOPER
+ 0, // 613 RPL_ENDOFISOPER
0, // 614
- 0, // 615
- 0, // 616
- 0, // 617
- 0, // 618
- 0, // 619
- 0, // 620
- 0, // 621
- 0, // 622
- 0, // 623
- 0, // 624
- 0, // 625
- 0, // 626
+ 0, // 615 RPL_MAPMORE
+ 0, // 616 RPL_WHOISHOST
+ 0, // 617 RPL_DCCSTATUS, RPL_WHOISBOT
+ 0, // 618 RPL_DCCLIST
+ 0, // 619 RPL_ENDOFDCCLIST, RPL_WHOWASHOST
+ 0, // 620 RPL_DCCINFO, RPL_RULESSTART
+ 0, // 621 RPL_RULES
+ 0, // 622 RPL_ENDOFRULES
+ 0, // 623 RPL_MAPMORE
+ 0, // 624 RPL_OMOTDSTART
+ 0, // 625 RPL_OMOTD
+ 0, // 626 RPL_ENDOFO
0, // 627
0, // 628
0, // 629
- 0, // 630
- 0, // 631
+ 0, // 630 RPL_SETTINGS
+ 0, // 631 RPL_ENDOFSETTINGS
0, // 632
0, // 633
0, // 634
@@ -728,9 +728,9 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 637
0, // 638
0, // 639
- 0, // 640
- 0, // 641
- 0, // 642
+ 0, // 640 RPL_DUMPING
+ 0, // 641 RPL_DUMPRPL
+ 0, // 642 RPL_EODUMP
0, // 643
0, // 644
0, // 645
@@ -748,37 +748,37 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 657
0, // 658
0, // 659
- 0, // 660
- 0, // 661
- 0, // 662
- 0, // 663
- 0, // 664
- 0, // 665
- 0, // 666
+ 0, // 660 RPL_TRACEROUTE_HOP
+ 0, // 661 RPL_TRACEROUTE_START
+ 0, // 662 RPL_MODECHANGEWARN
+ 0, // 663 RPL_CHANREDIR
+ 0, // 664 RPL_SERVMODEIS
+ 0, // 665 RPL_OTHERUMODEIS
+ 0, // 666 RPL_ENDOF_GENERIC
0, // 667
0, // 668
0, // 669
- PTM(parseNumericStartTls) , // 670 RPL_STARTTLSOK
+ PTM(parseNumericStartTls) , // 670 RPL_STARTTLSOK, RPL_WHOWASDETAILS
PTM(parseNumericWhoisOther) , // 671 RPL_WHOISSECURE
- 0, // 672
- 0, // 673
+ 0, // 672 RPL_UNKNOWNMODES
+ 0, // 673 RPL_CANNOTSETMODES
0, // 674
0, // 675
0, // 676
0, // 677
- 0, // 678
- 0, // 679
+ 0, // 678 RPL_LUSERSTAFF
+ 0, // 679 RPL_TIMEONSERVERIS
0, // 680
0, // 681
- 0, // 682
+ 0, // 682 RPL_NETWORKS
0, // 683
0, // 684
0, // 685
0, // 686
- 0, // 687
- 0, // 688
- 0, // 689
- 0, // 690
+ 0, // 687 RPL_YOURLANGUAGEIS
+ 0, // 688 RPL_LANGUAGE
+ 0, // 689 RPL_WHOISSTAFF
+ 0, // 690 RPL_WHOISLANGUAGE
PTM(parseNumericStartTls) , // 691 RPL_STARTTLSFAIL
0, // 692
0, // 693
@@ -790,31 +790,31 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 699
PTM(parseNumericCodePageSet) , // 700 RPL_CODEPAGESET
0, // 701
- 0, // 702
- PTM(parseNumericCodePageScheme) , // 703 RPL_WHOISSCHEME
- PTM(parseCommandSyntaxHelp), // 704 RPL_COMMANDSYNTAX
- PTM(parseCommandHelp), // 705 RPL_COMMANDHELP
- PTM(parseCommandEndOfHelp), // 706 RPL_ENDOFCOMMANDHELP
+ 0, // 702 RPL_MODLIST, RPL_COMMANDS
+ PTM(parseNumericCodePageScheme) , // 703 RPL_WHOISSCHEME, RPL_ENDOFMODLIST, RPL_COMMANDSEND
+ PTM(parseCommandSyntaxHelp), // 704 RPL_COMMANDSYNTAX, RPL_HELPSTART
+ PTM(parseCommandHelp), // 705 RPL_COMMANDHELP, RPL_HELPTXT
+ PTM(parseCommandEndOfHelp), // 706 RPL_ENDOFCOMMANDHELP, RPL_ENDOFHELP
0, // 707
- 0, // 708
- 0, // 709
- 0, // 710
- 0, // 711
- 0, // 712
- 0, // 713
- 0, // 714
- 0, // 715
- 0, // 716
- 0, // 717
- 0, // 718
+ 0, // 708 RPL_ETRACEFULL
+ 0, // 709 RPL_ETRACE
+ 0, // 710 RPL_KNOCK
+ 0, // 711 RPL_KNOCKDLVR
+ 0, // 712 ERR_TOOMANYKNOCK
+ 0, // 713 ERR_CHANOPEN
+ 0, // 714 ERR_KNOCKONCHAN
+ 0, // 715 ERR_KNOCKDISABLED
+ 0, // 716 RPL_TARGUMODEG
+ 0, // 717 RPL_TARGNOTIFY
+ 0, // 718 RPL_UMODEGMSG
0, // 719
- 0, // 720
- 0, // 721
- 0, // 722
- 0, // 723
- 0, // 724
- 0, // 725
- 0, // 726
+ 0, // 720 RPL_OMOTDSTART
+ 0, // 721 RPL_OMOTD
+ 0, // 722 RPL_ENDOFOMOTD
+ 0, // 723 ERR_NOPRIVS
+ 0, // 724 RPL_TESTMARK
+ 0, // 725 RPL_TESTLINE
+ 0, // 726 RPL_NOTESTLINE
0, // 727
0, // 728
0, // 729
@@ -859,10 +859,10 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 768
0, // 769
0, // 770
- 0, // 771
+ 0, // 771 RPL_XINFO
0, // 772
- 0, // 773
- 0, // 774
+ 0, // 773 RPL_XINFOSTART
+ 0, // 774 RPL_XINFOEND
0, // 775
0, // 776
0, // 777
@@ -989,7 +989,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 898
0, // 899
PTM(parseNumericSaslLogin), // 900 RPL_SASLLOGIN
- 0, // 901
+ 0, // 901
0, // 902
PTM(parseNumericSaslSuccess), // 903 RPL_SASLSUCCESS
PTM(parseNumericSaslFail), // 904 RPL_SASLFAILED
@@ -1024,7 +1024,7 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 933
0, // 934
0, // 935
- 0, // 936
+ 0, // 936 RPL_WORDFILTERED
0, // 937
0, // 938
0, // 939
@@ -1060,18 +1060,18 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 969
0, // 970
0, // 971
- 0, // 972
- 0, // 973
- 0, // 974
- 0, // 975
- 0, // 976
- 0, // 977
+ 0, // 972 ERR_CANNOTDOCOMMAND, ERR_CANTUNLOADMODULE
+ 0, // 973 ERR_CANNOTCHANGEUMODE, RPL_UNLOADEDMODULE
+ 0, // 974 ERR_CANNOTCHANGECHANMODE, ERR_CANTLOADMODULE
+ 0, // 975 ERR_CANNOTCHANGESERVERMODE, RPL_LOADEDMODULE
+ 0, // 976 ERR_CANNOTSENDTONICK
+ 0, // 977 ERR_UNKNOWNSERVERMODE
0, // 978
- 0, // 979
- 0, // 980
- 0, // 981
- 0, // 982
- 0, // 983
+ 0, // 979 ERR_SERVERMODELOCK
+ 0, // 980 ERR_BADCHARENCODING
+ 0, // 981 ERR_TOOMANYLANGUAGES
+ 0, // 982 ERR_NOLANGUAGE
+ 0, // 983 ERR_TEXTTOOSHORT
0, // 984
0, // 985
0, // 986
@@ -1087,5 +1087,5 @@ messageParseProc KviIrcServerParser::m_numericParseProcTable[1000]=
0, // 996
0, // 997
0, // 998
- 0 // 999
+ 0 // 999 ERR_NUMERIC_ERR
};
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 53f9e0d32..5ba80d354 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -862,7 +862,9 @@ void KviInputEditor::mousePressEvent(QMouseEvent * e)
pAction->setMenu(m_pIconMenu);
#if (QT_VERSION >= 0x050000)
+ #ifdef __GNUC__
#warning Implement Input Methods in KviInputEditor using the new qt5 api!
+ #endif
/*
* Actually the use of input method composing works, but we are unable to query the list of
* available ims and change the active one. By now Qt5's QInputMethod lacks several methods,
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index d565d6087..c55671092 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -921,16 +921,16 @@ void KviMainWindow::updatePseudoTransparency()
uint uOpacity = KVI_OPTION_UINT(KviOption_uintGlobalWindowOpacityPercent) < 50 ? 50 : KVI_OPTION_UINT(KviOption_uintGlobalWindowOpacityPercent);
setWindowOpacity((float) uOpacity / 100);
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- #ifndef Q_OS_WIN_EX_LAYERED
- #define Q_OS_WIN_EX_LAYERED WS_EX_LAYERED
+ #ifndef Q_WS_EX_LAYERED
+ #define Q_WS_EX_LAYERED WS_EX_LAYERED
#endif
if(uOpacity < 100)
{
SetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE,
- GetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE) | Q_OS_WIN_EX_LAYERED);
+ GetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE) | Q_WS_EX_LAYERED);
} else {
SetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE,
- GetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE) & ~Q_OS_WIN_EX_LAYERED);
+ GetWindowLong(reinterpret_cast<HWND>(effectiveWinId()), GWL_EXSTYLE) & ~Q_WS_EX_LAYERED);
}
#endif
if(g_pShadedParentGlobalDesktopBackground)m_pMdi->viewport()->update();
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index e23daa0bd..f9ed6c7b9 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -24,7 +24,9 @@
#include "KvsObject_ftp.h"
-#warning QFtp doesn't exists anymore in Qt5, port this class or drop it
+#ifdef __GNUC__
+#warning QFtp doesn't exist anymore in Qt5, port this class or drop it
+#endif
#if (QT_VERSION < 0x050000)
#include "kvi_debug.h"
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index b82c683b6..3983f5d90 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -24,7 +24,9 @@
#include "KvsObject_http.h"
-#warning QHttp doesn't exists anymore in Qt5, port this class or drop it
+#ifdef __GNUC__
+#warning QHttp doesn't exist anymore in Qt5, port this class or drop it
+#endif
#if (QT_VERSION < 0x050000)
#include "kvi_debug.h"
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 6c857b79f..101d31920 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -68,6 +68,7 @@
#include <perl.h>
#include <XSUB.h>
+ #define NEED_eval_pv
#include "ppport.h"
#include "KviKvsRunTimeContext.h"
@@ -77,7 +78,7 @@
static KviCString g_szLastReturnValue("");
static QStringList g_lWarningList;
- // this is why we can't have nice things
+ // this is why we can't have nice things -- part of perl 5.17.1+
#ifdef __cplusplus
#define dNOOP (void)0
#else
diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index d07f52d03..b4019924e 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -4,9 +4,9 @@
/*
----------------------------------------------------------------------
- ppport.h -- Perl/Pollution/Portability Version 3.21
+ ppport.h -- Perl/Pollution/Portability Version 3.24
- Automatically created by Devel::PPPort running under perl 5.018001.
+ Automatically created by Devel::PPPort running under perl 5.020000.
Version 3.x, Copyright (c) 2004-2013, Marcus Holland-Moritz.
@@ -23,8 +23,8 @@ SKIP
if (@ARGV && $ARGV[0] eq '--unstrip') {
eval { require Devel::PPPort };
$@ and die "Cannot require Devel::PPPort, please install.\n";
- if (eval $Devel::PPPort::VERSION < 3.21) {
- die "ppport.h was originally generated with Devel::PPPort 3.21.\n"
+ if (eval $Devel::PPPort::VERSION < 3.24) {
+ die "ppport.h was originally generated with Devel::PPPort 3.24.\n"
. "Your Devel::PPPort is only version $Devel::PPPort::VERSION.\n"
. "Please install a newer version, or --unstrip will not work.\n";
}
@@ -788,6 +788,13 @@ typedef OP* (CPERLscope(*Perl_check_t)) (pTHX_ OP*);
#define isXDIGIT(c) (isDIGIT(c) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
#endif
#endif
+#if (PERL_BCDVERSION >= 0x5008000)
+#ifndef HeUTF8
+#define HeUTF8(he) ((HeKLEN(he) == HEf_SVKEY) ? \
+SvUTF8(HeKEY_sv(he)) : \
+(U32)HeKUTF8(he))
+#endif
+#endif
#ifndef PERL_SIGNALS_UNSAFE_FLAG
#define PERL_SIGNALS_UNSAFE_FLAG 0x0001
#if (PERL_BCDVERSION < 0x5008000)
@@ -1042,6 +1049,9 @@ const int oexpect = PL_expect;
#if (PERL_BCDVERSION >= 0x5004000)
utilize(!(flags & PERL_LOADMOD_DENY), start_subparse(FALSE, 0),
veop, modname, imop);
+#elif (PERL_BCDVERSION > 0x5003000)
+utilize(!(flags & PERL_LOADMOD_DENY), start_subparse(),
+veop, modname, imop);
#else
utilize(!(flags & PERL_LOADMOD_DENY), start_subparse(),
modname, imop);
@@ -2017,6 +2027,15 @@ warn("%s", SvPV_nolen(sv));
#ifndef SvGETMAGIC
#define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
#endif
+#ifndef HEf_SVKEY
+#define HEf_SVKEY -2
+#endif
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
+#define MUTABLE_PTR(p) ({ void *_p = (p); _p; })
+#else
+#define MUTABLE_PTR(p) ((void *) (p))
+#endif
+#define MUTABLE_SV(p) ((SV *)MUTABLE_PTR(p))
#ifndef PERL_MAGIC_sv
#define PERL_MAGIC_sv '\0'
#endif
@@ -2258,6 +2277,89 @@ sv_magic(SvMp_sv, obj, how, SvMp_name, SvMp_namlen); \
#else
#define sv_magic_portable(a, b, c, d, e) sv_magic(a, b, c, d, e)
#endif
+#if !defined(mg_findext)
+#if defined(NEED_mg_findext)
+static MAGIC * DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl);
+static
+#else
+extern MAGIC * DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl);
+#endif
+#ifdef mg_findext
+#undef mg_findext
+#endif
+#define mg_findext(a,b,c) DPPP_(my_mg_findext)(aTHX_ a,b,c)
+#define Perl_mg_findext DPPP_(my_mg_findext)
+#if defined(NEED_mg_findext) || defined(NEED_mg_findext_GLOBAL)
+MAGIC *
+DPPP_(my_mg_findext)(pTHX_ SV * sv, int type, const MGVTBL *vtbl) {
+if (sv) {
+MAGIC *mg;
+#ifdef AvPAD_NAMELIST
+assert(!(SvTYPE(sv) == SVt_PVAV && AvPAD_NAMELIST(sv)));
+#endif
+for (mg = SvMAGIC (sv); mg; mg = mg->mg_moremagic) {
+if (mg->mg_type == type && mg->mg_virtual == vtbl)
+return mg;
+}
+}
+return NULL;
+}
+#endif
+#endif
+#if !defined(sv_unmagicext)
+#if defined(NEED_sv_unmagicext)
+static int DPPP_(my_sv_unmagicext)(pTHX_ SV * const sv, const int type, MGVTBL * vtbl);
+static
+#else
+extern int DPPP_(my_sv_unmagicext)(pTHX_ SV * const sv, const int type, MGVTBL * vtbl);
+#endif
+#ifdef sv_unmagicext
+#undef sv_unmagicext
+#endif
+#define sv_unmagicext(a,b,c) DPPP_(my_sv_unmagicext)(aTHX_ a,b,c)
+#define Perl_sv_unmagicext DPPP_(my_sv_unmagicext)
+#if defined(NEED_sv_unmagicext) || defined(NEED_sv_unmagicext_GLOBAL)
+int
+DPPP_(my_sv_unmagicext)(pTHX_ SV *const sv, const int type, MGVTBL *vtbl)
+{
+MAGIC* mg;
+MAGIC** mgp;
+if (SvTYPE(sv) < SVt_PVMG || !SvMAGIC(sv))
+return 0;
+mgp = &(SvMAGIC(sv));
+for (mg = *mgp; mg; mg = *mgp) {
+const MGVTBL* const virt = mg->mg_virtual;
+if (mg->mg_type == type && virt == vtbl) {
+*mgp = mg->mg_moremagic;
+if (virt && virt->svt_free)
+virt->svt_free(aTHX_ sv, mg);
+if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global) {
+if (mg->mg_len > 0)
+Safefree(mg->mg_ptr);
+else if (mg->mg_len == HEf_SVKEY)
+SvREFCNT_dec(MUTABLE_SV(mg->mg_ptr));
+else if (mg->mg_type == PERL_MAGIC_utf8)
+Safefree(mg->mg_ptr);
+}
+if (mg->mg_flags & MGf_REFCOUNTED)
+SvREFCNT_dec(mg->mg_obj);
+Safefree(mg);
+}
+else
+mgp = &mg->mg_moremagic;
+}
+if (SvMAGIC(sv)) {
+if (SvMAGICAL(sv))
+mg_magical(sv);
+}
+else {
+SvMAGICAL_off(sv);
+SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+}
+return 0;
+}
+#endif
+#endif
#ifdef USE_ITHREADS
#ifndef CopFILE
#define CopFILE(c) ((c)->cop_file)
@@ -3040,10 +3142,10 @@ const U8 c = (U8)u & 0xFF;
if (u > 255 || (flags & PERL_PV_ESCAPE_ALL)) {
if (flags & PERL_PV_ESCAPE_FIRSTCHAR)
chsize = my_snprintf(octbuf, sizeof octbuf,
-"%"UVxf, u);
+"%" UVxf, u);
else
chsize = my_snprintf(octbuf, sizeof octbuf,
-"%cx{%"UVxf"}", esc, u);
+"%cx{%" UVxf "}", esc, u);
} else if (flags & PERL_PV_ESCAPE_NOBACKSLASH) {
chsize = 1;
} else {
diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc
index fa42e8f3c..0db33318e 100644
--- a/src/modules/perlcore/xs.inc
+++ b/src/modules/perlcore/xs.inc
@@ -1,5 +1,5 @@
/*
- * This file was generated automatically by ExtUtils::ParseXS version 3.22 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.24 from the
* contents of KVIrc.xs. Do not edit this file, edit KVIrc.xs instead.
*
* ANY CHANGES MADE HERE WILL BE LOST!