diff options
Diffstat (limited to 'tdecore')
296 files changed, 4276 insertions, 18455 deletions
diff --git a/tdecore/CMakeL10n.txt b/tdecore/CMakeL10n.txt new file mode 100644 index 000000000..40fa1531b --- /dev/null +++ b/tdecore/CMakeL10n.txt @@ -0,0 +1,81 @@ +##### update all_languages.desktop ############## + +message( STATUS "Update all_languages.desktop according to the entry.desktop files from tde-i18n" ) + +# read the current list of language codes and names +unset( _languages_code ) +unset( _languages_name ) +file( READ ${CMAKE_CURRENT_SOURCE_DIR}/all_languages.desktop _langs_current ) +string( REGEX REPLACE "[^\n]" "" _langs_current_len "${_langs_current}" ) +string( LENGTH "+${_langs_current_len}" _langs_current_len ) +set( _langs_current_pos 0 ) +while( _langs_current_pos LESS ${_langs_current_len} ) + string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\1" _lang_row "${_langs_current}" ) + string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\2" _langs_current "${_langs_current}" ) + math( EXPR _langs_current_pos "${_langs_current_pos}+1" ) + if( "${_lang_row}" MATCHES "^\\[.*\\]$" ) + string( REGEX REPLACE "^\\[(.*)\\]$" "\\1" _lang_code ${_lang_row} ) + endif() + if( (NOT "${_lang_code}" STREQUAL "") AND + ("${_lang_row}" MATCHES "^ *Name *=") ) + string( REGEX REPLACE "^ *Name *= *" "" _lang_name "${_lang_row}" ) + list( APPEND _languages_code ${_lang_code} ) + list( APPEND _languages_name ${_lang_name} ) + unset( _lang_code ) + endif() +endwhile() + +# merge with languages from tde-i18n entry.desktop files +file( GLOB _languages_dirs + RELATIVE ${CMAKE_SOURCE_DIR}/../tde-i18n + ${CMAKE_SOURCE_DIR}/../tde-i18n/tde-i18n-* +) +foreach( _lang_dir IN LISTS _languages_dirs ) + if( EXISTS ${CMAKE_SOURCE_DIR}/../tde-i18n/${_lang_dir}/messages/entry.desktop ) + string( REPLACE "tde-i18n-" "" _lang_code ${_lang_dir} ) + file( READ ${CMAKE_SOURCE_DIR}/../tde-i18n/${_lang_dir}/messages/entry.desktop _lang_name ) + string( REGEX REPLACE "(^|.*\n) *Name *= *([^\n]*).*" "\\2" _lang_name "${_lang_name}" ) + if( NOT "${_lang_name}" STREQUAL "" ) + list( FIND _languages_code "${_lang_code}" _lang_index ) + if( "${_lang_index}" GREATER -1 ) + list( REMOVE_AT _languages_code ${_lang_index} ) + list( REMOVE_AT _languages_name ${_lang_index} ) + endif() + list( APPEND _languages_code ${_lang_code} ) + list( APPEND _languages_name ${_lang_name} ) + endif() + endif() +endforeach() + +# create new all_languages.desktop +unset( _languages ) +foreach( _lang_code IN LISTS _languages_code ) + list( FIND _languages_code "${_lang_code}" _lang_index ) + list( GET _languages_name ${_lang_index} _lang_name ) + list( APPEND _languages "${_lang_code}: ${_lang_name}" ) +endforeach() +if( _languages ) + unset( _all_languages ) + list( SORT _languages ) + foreach( _lang IN LISTS _languages ) + string( REGEX REPLACE "^([^:]*): (.*)" "\\1" _lang_code ${_lang} ) + string( REGEX REPLACE "^([^:]*): (.*)" "\\2" _lang_name ${_lang} ) + set( _all_languages "${_all_languages}[${_lang_code}]\nName=${_lang_name}\n" ) + endforeach() + file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/all_languages.desktop "${_all_languages}" ) +endif() + + +##### create translation templates ############## + +tde_l10n_create_template( + CATALOG "desktop_files/all_languages.desktop/" + SOURCES all_languages.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) + +tde_l10n_create_template( + CATALOG "desktop_files/tdecore-eventsrc/" + SOURCES_DESKTOP eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index dd9bbe76e..96032d616 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -17,7 +17,6 @@ add_subdirectory( tests ) if( WITH_TDEHWLIB ) add_subdirectory( tdehw ) set( TDEHW_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tdehw ) - set( TDEHW_LIB tdehw-static ) endif( WITH_TDEHWLIB ) if( WITH_LIBART ) @@ -50,22 +49,22 @@ link_directories( ##### headers ################################### install( FILES - tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h - tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h + tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h tdesimpleconfig.h + tdeconfigdialogmanager.h tdeconfigbase.h tdedesktopfile.h kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h - kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h - kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h + tdeapplication.h tdeuniqueapplication.h + kcharsets.h tdeversion.h kpty.h tdeprocess.h tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h - kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h - kregexp.h kcompletion.h kstringhandler.h kstddirs.h - kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h - kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h + tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h + kregexp.h kcompletion.h kstringhandler.h + tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h + kallocator.h kvmallocator.h tdecrash.h krfcdate.h tdeinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h - kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h + kextendedsocket.h ksockaddr.h tdeprocio.h kasyncio.h kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc @@ -74,14 +73,17 @@ install( FILES kmanagerselection.h kmountpoint.h kuser.h klockfile.h kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h kde_file.h ktimezones.h - ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h + ${CMAKE_CURRENT_BINARY_DIR}/tdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ -install( FILES all_languages.desktop - DESTINATION ${LOCALE_INSTALL_DIR} RENAME all_languages ) +tde_create_translated_desktop( + SOURCE all_languages.desktop + DESTINATION ${LOCALE_INSTALL_DIR} + OUTPUT_NAME all_languages +) install( FILES 40.colors Web.colors Royal.colors Rainbow.colors DESTINATION ${CONFIG_INSTALL_DIR}/colors ) @@ -92,8 +94,11 @@ install( FILES kdebug.areas kdebugrc language.codes install( FILES kmdcodec_compat.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio RENAME kmdcodec.h ) -install( FILES eventsrc - DESTINATION ${DATA_INSTALL_DIR}/knotify ) +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/knotify + PO_DIR tdecore-eventsrc +) ##### libtdecore ################################ @@ -101,27 +106,27 @@ set( target tdecore ) set( ${target}_SRCS libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp - tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp - kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp - ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp tdelocale.cpp + tdeconfigbase.cpp tdeconfig.cpp tdesimpleconfig.cpp tdeconfigbackend.cpp + kmanagerselection.cpp tdedesktopfile.cpp tdestandarddirs.cpp + ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp - kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp - kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp + tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp + tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp - kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp - kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp + tdeinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp + tdeuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp - kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp + kextsock.cpp netsupp.cpp tdeprocio.cpp kbufferedio.cpp kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp - kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp + tdeappdcopinterface.cpp tdeappdcopinterface.skel kclipboard.cpp kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp @@ -134,12 +139,12 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} - VERSION 14.0.0 - EMBED tdecorenetwork-static ${TDEHW_LIB} - LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} - ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES} - ${LIBBFD_LIBRARIES} ${LIB_UTIL} - DEPENDENCIES dcopidl dcopidl2cpp + VERSION 14.1.0 + EMBED tdecorenetwork-static + LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES} ${RESOLV_LIBRARIES} + LINK_PRIVATE ltdlc-static ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES} + ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${GAMIN_LIBRARIES} + ${Backtrace_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading index a675a8922..1a90f43ef 100644 --- a/tdecore/DESIGN.iconloading +++ b/tdecore/DESIGN.iconloading @@ -42,7 +42,7 @@ That way the application's pixmap always remain valid. Some example code to get the idea: Server can publish an icon (test.png) like this: - QImage i("test.png"); + TQImage i("test.png"); QPixmap p; p.convertFromImage(i); tqWarning("Handle = %08x", p.handle()); diff --git a/tdecore/DESIGN.tdeconfig b/tdecore/DESIGN.tdeconfig index a1fb48dbd..1a3645051 100644 --- a/tdecore/DESIGN.tdeconfig +++ b/tdecore/DESIGN.tdeconfig @@ -93,7 +93,7 @@ default so that it doesn't change when the default changes? KDE3.0 Changes ============== -*) writeEntry now returns void instead of QString. +*) writeEntry now returns void instead of TQString. *) deleteEntry functions added @@ -176,7 +176,7 @@ Class overview TDEConfigBackend <-----> TDEConfig <------> TDEConfigSkeleton /--< myapp.kcfg | | | / v v |*---------------< -TDEConfigINIBackend KSimpleConfig |tdeconfig_compiler \ +TDEConfigINIBackend TDESimpleConfig |tdeconfig_compiler \ | \--< myconfig.kcfg-codegen v MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui @@ -187,7 +187,7 @@ TDEConfigBase: defines API for generic config class TDEConfig: functional generic config class that supports merging of cascaded configuration files -KSimpleConfig: functional generic config class without support for cascading +TDESimpleConfig: functional generic config class without support for cascading configuration files. TDEConfigBackend: defines API for config backend, t.i. the actual handling diff --git a/tdecore/KCONFIG_DESIGN b/tdecore/KCONFIG_DESIGN index d0fa141ff..83b6bf2d4 100644 --- a/tdecore/KCONFIG_DESIGN +++ b/tdecore/KCONFIG_DESIGN @@ -30,7 +30,7 @@ reads/writes the standard windows INI-style configuration files that KDE has used since KDE 1.x days. However, it is conceivable that one might program an XML backend, or even a database/registry style backend. Again, this abstract data type approach provides flexibility -for the future. Currently TDEConfig and KSimpleConfig hardcode that +for the future. Currently TDEConfig and TDESimpleConfig hardcode that they are using a TDEConfigINIBackEnd in the constructor. If more back ends are implemented, this will have to be changed to use a factory method of some sort to create the backend; all they maintain is a diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index ae94ecd7c..902ffd444 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -6,12 +6,12 @@ When adding yourself as a maintainer, don't be afraid to reorder the files to a more logical grouping. dmalloc.cpp -tdeaboutdata.cpp David Faure <faure@kde.org> +tdeaboutdata.cpp David Faure <faure@kde.org> tdeaccel.cpp Ellis Whitehead <ellis@kde.org> tdeaccelaction.cpp Ellis Whitehead <ellis@kde.org> -tdeaccelbase.cpp Ellis Whitehead <ellis@kde.org> +tdeaccelbase.cpp Ellis Whitehead <ellis@kde.org> kallocator.cpp Waldo Bastian <bastian@kde.org> -kappdcopiface.cpp +tdeappdcopinterface.cpp tdeapplication.cpp Waldo Bastian <bastian@kde.org> kaudioplayer.cpp kcatalogue.cpp Hans Petter Bieker <bieker@kde.org> @@ -22,19 +22,19 @@ kcompletion.cpp Carsten Pfeiffer <pfeiffer@kde.org> kcompletionbase.cpp tdeconfig.cpp Waldo Bastian <bastian@kde.org> tdeconfigbackend.cpp Waldo Bastian <bastian@kde.org> -tdeconfigbase.cpp Waldo Bastian <bastian@kde.org> -kcrash.cpp Waldo Bastian <bastian@kde.org> +tdeconfigbase.cpp Waldo Bastian <bastian@kde.org> +tdecrash.cpp Waldo Bastian <bastian@kde.org> kdcoppropertyproxy.cpp kdebug.cpp Stephan Kulow <coolo@kde.org> -kdesktopfile.cpp +tdedesktopfile.cpp tdeglobal.cpp Stephan Kulow <coolo@kde.org> -kglobalaccel.cpp Ellis Whitehead <ellis@kde.org> -kglobalaccel_x11.cpp Ellis Whitehead <ellis@kde.org> +tdeglobalaccel.cpp Ellis Whitehead <ellis@kde.org> +tdeglobalaccel_x11.cpp Ellis Whitehead <ellis@kde.org> tdeglobalsettings.cpp David Faure <faure@kde.org> kiconeffect.cpp kiconloader.cpp kicontheme.cpp -kinstance.cpp Stephan Kulow <coolo@kde.org> +tdeinstance.cpp Stephan Kulow <coolo@kde.org> kipc.cpp Lubos Lunak <l.lunak@kde.org> kkey_x11.cpp Ellis Whitehead <ellis@kde.org> kkeynative_x11.cpp Ellis Whitehead <ellis@kde.org> @@ -48,27 +48,27 @@ tdemultipledrag.cpp David Faure <faure@kde.org> knotifyclient.cpp kpalette.cpp Waldo Bastian <bastian@kde.org> kpixmapprovider.cpp Carsten Pfeiffer <pfeiffer@kde.org> -kprocctrl.cpp Waldo Bastian <bastian@kde.org> -kprocess.cpp Waldo Bastian <bastian@kde.org> -kprocio.cpp Waldo Bastian <bastian@kde.org> +tdeprocctrl.cpp Waldo Bastian <bastian@kde.org> +tdeprocess.cpp Waldo Bastian <bastian@kde.org> +tdeprocio.cpp Waldo Bastian <bastian@kde.org> krandomsequence.cpp Waldo Bastian <bastian@kde.org> kregexp.cpp krfcdate.cpp Waldo Bastian <bastian@kde.org> krootprop.cpp Lubos Lunak <l.lunak@kde.org> ksavefile.cpp Waldo Bastian <bastian@kde.org> tdeshortcut.cpp Ellis Whitehead <ellis@kde.org> -ksimpleconfig.cpp Waldo Bastian <bastian@kde.org> +tdesimpleconfig.cpp Waldo Bastian <bastian@kde.org> ksocks.cpp -kstandarddirs.cpp Waldo Bastian <bastian@kde.org> +tdestandarddirs.cpp Waldo Bastian <bastian@kde.org> tdestartupinfo.cpp Lubos Lunak <l.lunak@kde.org> kstaticdeleter.cpp Stephan Kulow <coolo@kde.org> tdestdaccel.cpp Ellis Whitehead <ellis@kde.org> kstringhandler.cpp tdesycoca.cpp Waldo Bastian <bastian@kde.org> -tdesycocadict.cpp Waldo Bastian <bastian@kde.org> +tdesycocadict.cpp Waldo Bastian <bastian@kde.org> tdesycocafactory.cpp Waldo Bastian <bastian@kde.org> tdetempfile.cpp Waldo Bastian <bastian@kde.org> -kuniqueapplication.cpp Waldo Bastian <bastian@kde.org> +tdeuniqueapplication.cpp Waldo Bastian <bastian@kde.org> kurl.cpp Waldo Bastian <bastian@kde.org> kurldrag.cpp David Faure <faure@kde.org> twin.cpp Lubos Lunak <l.lunak@kde.org> @@ -98,7 +98,7 @@ tdeconfigdialogmanager.cpp tdeconfigskeleton.cpp kdebugdcopiface.cpp Andreas Beckermann (b_mann@gmx.de) (copyright) tdeversion.cpp -kglobalaccel_win.cpp Ellis Whitehead <ellis@kde.org> (copyright) +tdeglobalaccel_win.cpp Ellis Whitehead <ellis@kde.org> (copyright) kkeyserver_x11.cpp klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright) kmacroexpander.cpp diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox index cbf8f69d9..4a74d242a 100644 --- a/tdecore/Mainpage.dox +++ b/tdecore/Mainpage.dox @@ -37,6 +37,5 @@ Some helper utilities: @gpl */ // DOXYGEN_EXCLUDE = malloc kde_file.h -// DOXYGEN_SET_INPUT += @topdir@/kdemacros.h.cmake +// DOXYGEN_SET_INPUT += @topdir@/tdemacros.h.cmake // DOXYGEN_SET_PROJECT_NAME = TrinityCore -// vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 58e74a010..0997aad45 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -37,21 +37,21 @@ lib_LTLIBRARIES = libtdefakes.la libtdecore.la lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ - tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \ - tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \ - tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \ - kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \ - kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \ + tdeconfigdata.h tdesimpleconfig.h tdeconfigdialogmanager.h \ + tdeconfigbase.h tdedesktopfile.h kurl.h ksock.h tdeaboutdata.h \ + tdecmdlineargs.h tdeconfigbackend.h tdeapplication.h \ + tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h \ + tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \ twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \ - kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \ + tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \ kregexp.h kcompletion.h kstringhandler.h \ - kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \ - kallocator.h kvmallocator.h kcrash.h krfcdate.h \ - kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \ + tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \ + kallocator.h kvmallocator.h tdecrash.h krfcdate.h \ + tdeinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \ krandomsequence.h knotifyclient.h kiconeffect.h \ kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \ netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \ - kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \ + kextsock.h kextendedsocket.h ksockaddr.h tdeprocio.h kasyncio.h \ kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \ tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \ klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \ @@ -59,7 +59,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \ kmanagerselection.h kmountpoint.h kuser.h klockfile.h \ kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h \ - kdemacros.h kde_file.h ktimezones.h + tdemacros.h kde_file.h ktimezones.h libtdefakes_la_SOURCES = fakes.c vsnprintf.c libtdefakes_la_LDFLAGS = -version-info 6:0:2 @@ -83,35 +83,35 @@ libtdefakes_pic.a: libtdefakes.la noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \ kcompletion_private.h netwm_p.h \ - kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ + tdeglobalaccel_x11.h tdeglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \ kcheckaccelerators.h kcalendarsystemgregorian.h \ kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \ kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \ - kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp \ - tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \ - kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \ + kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp tdesimpleconfig.cpp \ + tdeconfigbackend.cpp kmanagerselection.cpp tdedesktopfile.cpp \ + tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \ tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \ kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \ kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \ tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \ - kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \ - kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \ + tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \ + tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \ kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \ - kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \ - kuniqueapplication.cpp tdeaccelmanager.cpp \ + tdeinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \ + tdeuniqueapplication.cpp tdeaccelmanager.cpp \ ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \ tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \ kaudioplayer.cpp kdcoppropertyproxy.cpp \ - ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \ + ksockaddr.cpp kextsock.cpp netsupp.cpp tdeprocio.cpp kbufferedio.cpp \ kpixmapprovider.cpp kurldrag.cpp \ kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \ tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \ kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \ - tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \ - kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \ + tdemultipledrag.cpp kstaticdeleter.cpp tdeappdcopinterface.cpp \ + tdeappdcopinterface.skel kclipboard.cpp kcheckaccelerators.cpp \ tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \ kcalendarsystem.cpp kcalendarsystemgregorian.cpp \ kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \ diff --git a/tdecore/README.exec b/tdecore/README.exec index d47c808e9..6ddf1aef4 100644 --- a/tdecore/README.exec +++ b/tdecore/README.exec @@ -16,9 +16,9 @@ child of your process, e.g. because you want to catch stdout/stderr or need to send it data via stdin. You should never use this to start other KDE applications unless your application is called kgdb :-) If you need to send/receive text like data to/from the process, you are probably better -off with KProcIO +off with TDEProcIO -3. KProcIO +3. TDEProcIO Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to send data to and receive data from the process. diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index ae4f72d47..8ef01e8fe 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -1,25 +1,25 @@ In KDE3 a kiosk-framework has been introduced. -One of the driving forces behind KDE is to put the user in control and -give him or her a large amount of possibilities to adjust KDE to his or her +One of the driving forces behind TDE is to put the user in control and +give them a large amount of possibilities to adjust TDE to their liking. However, in some situations it is required to reduce the possibilities -of KDE, e.g. because the system is to be used for one or more specific +of TDE, e.g. because the system is to be used for one or more specific dedicated tasks only. The kiosk-framework provides an easy way to disable certain features within -KDE to create a more controlled environment. +TDE to create a more controlled environment. -KDE's kiosk-framework builds on KDE's configuration framework and adds a +TDE's kiosk-framework builds on TDE's configuration framework and adds a simple application API that applications can query to get authorisation for certain operations. -The KDE kiosk-framework should be used IN ADDITION to the standard UNIX +The TDE kiosk-framework should be used IN ADDITION to the standard UNIX security measures. The configuration framework in KDE3 =================================== -Since the very beginning KDE makes use of file-hierarchy to store resources +Since the very beginning TDE makes use of file-hierarchy to store resources for its applications. Resources range from icons, wallpapers, fonts to sounds, menu-descriptions and configuration files. @@ -550,16 +550,16 @@ Some remarks: matches "/srv" and not "/srv/www". -KDE3 Resource Restrictions +TDE Resource Restrictions ========================== -Most KDE applications make use of additional resource files that are typically -located in directories under $TDEDIR/share. By default KDE allows users to +Most TDE applications make use of additional resource files that are typically +located in directories under $TDEDIR/share. By default TDE allows users to override any of these resources by placing files in the same location under $TDEHOME/share. For example, Konsole stores profiles under $TDEDIR/share/apps/konsole and users can add additional profiles by installing files in $TDEHOME/share/apps/konsole. -KDE3 Resource Restrictions make it possible to restrict the lookup of files +TDE Resource Restrictions make it possible to restrict the lookup of files to directories outside of $TDEHOME only. The following resources are defined: @@ -642,14 +642,14 @@ The following syntax is also supported: Name[$ei]=${USER} -KDE3 Kiosk Application API +TDE Kiosk Application API ========================== Three new methods have been added to TDEApplication: -- bool authorize(QString action); // Generic actions -- bool authorizeTDEAction(QString action); // For TDEActions exclusively -- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling +- bool authorize(TQString action); // Generic actions +- bool authorizeTDEAction(TQString action); // For TDEActions exclusively +- bool authorizeURLAction(TQString, referringURL, destinationURL) // URL Handling Automatic Logout ================ diff --git a/tdecore/README.tdestartupinfo b/tdecore/README.tdestartupinfo index 71e786b0d..e28bc99ed 100644 --- a/tdecore/README.tdestartupinfo +++ b/tdecore/README.tdestartupinfo @@ -119,7 +119,7 @@ Sending the application startup notification information : it's done by classes like KRun ). See e.g. KRun sources for details. During the starting of the application, the info may need some updating ( e.g. right after starting the app, the PID with hostname may be sent, -or a PID change when KUniqueApplication forks into background ). +or a PID change when TDEUniqueApplication forks into background ). When it's detected that the started process exited, it an ASN info about the finished process should be sent. Since the application may have forked into background, the finish info should include the PID @@ -143,7 +143,7 @@ Ideally, the application should read it, and set a window property called _TDE_STARTUP_ID ( type XA_STRING ) at least on its first mapped toplevel window to this value. It should also unset it, so it doesn't get propagated to other applications started from it. It should also -update the ASN info when necessary, e.g. when KUniqueApplication +update the ASN info when necessary, e.g. when TDEUniqueApplication forks into background, it sends the PID change. That's how compliant applications should work, and this support for ASN should be provided by toolkits. All TDE application should be compliant by now, since @@ -192,7 +192,7 @@ There are 3 types of messages : - change: message - this message is like new: message, but it's only for updating existing ASN info, if there's no ASN info for the given identification, it won't - be created. This is used e.g. in KUniqueApplication when it forks + be created. This is used e.g. in TDEUniqueApplication when it forks into background and sends info about the PID change - it should update any existing ASN info, but mustn't create a new one, otherwise there could appear ASN even for applications which shouldn't have ASN diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop index 487b8da58..82430b199 100644 --- a/tdecore/all_languages.desktop +++ b/tdecore/all_languages.desktop @@ -1,11919 +1,358 @@ [aa] Name=Afar -Name[az]=Afarca -Name[be]=ÐфарÑÐºÐ°Ñ -Name[bg]=Ðфар -Name[bn]=আফার -Name[csb]=Afarsczi -Name[cy]=Afareg -Name[eo]=Fora -Name[fa]=اÙار -Name[ga]=Afárais -Name[he]=×פ×ר -Name[hi]=अफà¥à¤° -Name[hr]=Afarski -Name[ja]=アファル語 -Name[ka]=áƒáƒ¤áƒáƒ ული -Name[kk]=Ðфарша -Name[km]=អាហ្វារ -Name[ko]=아파르어 -Name[lt]=Afarų -Name[lv]=AfÄru -Name[mk]=Ðфар -Name[mn]=Ðфар -Name[nds]=Afaarsch -Name[ne]=अफार -Name[nso]=Kgolekgole -Name[pa]=ਅਫਾਰ -Name[pl]=Afarski -Name[ro]=Afară -Name[ru]=ÐфарÑкий -Name[rw]=Ikinyafari -Name[se]=Afárgiella -Name[sk]=afarÄina -Name[sl]=afarsko -Name[sq]=Afarisht -Name[sr]=ÐфарÑки -Name[sr@Latn]=Afarski -Name[ss]=Si-Afar -Name[ta]=அஃபார௠-Name[te]=ఎఫారౠ-Name[tg]=Ðфарӣ -Name[th]=ภาษาà¸à¸°à¸Ÿà¸²à¸£à¹Œ -Name[tt]=Afarça -Name[uk]=Ðфар -Name[uz@cyrillic]=Ðфар -Name[vi]=Ä‚-pha -Name[zh_CN]=é˜¿æ³•å°”è¯ -Name[zh_HK]=阿發爾 -Name[zh_TW]=阿發爾 -Name[zu]=Okude kakhulu [ab] Name=Abkhazian -Name[ar]=أبخازي -Name[az]=Abxazca -Name[be]=ÐбхазÑÐºÐ°Ñ -Name[bg]=Ðбхазки -Name[bn]=আবখাজিয়ান -Name[br]=Abkhazieg -Name[bs]=Abhaski -Name[ca]=Àzeri -Name[cs]=Abcházský -Name[csb]=Abchasczi -Name[cy]=Abkhazeg -Name[da]=Abkhaziansk -Name[de]=Abhasisch -Name[eo]=AbÄ¥aza -Name[et]=Abhaasia -Name[fa]=ابخازیان -Name[fi]=Abhaasi -Name[fr]=Abkhaze -Name[fy]=Abkhasysk -Name[ga]=Abcáisis -Name[gl]=Abxásio -Name[he]=×בחזית -Name[hi]=अबकाजियन -Name[hr]=AbhaÅ¡ki -Name[hsb]=Abchazisce -Name[hu]=Abház -Name[it]=Abkhaziano -Name[ja]=アブãƒã‚ºèªž -Name[ka]=áƒáƒ¤áƒ®áƒáƒ–ური -Name[kk]=Ðхбазша -Name[km]=អាប់ážáž¶áž ្ស៊ាន -Name[ko]=아브하지아어 -Name[lb]=Abhasesch -Name[lt]=Abhazų -Name[lv]=AbhÄzu -Name[mk]=ÐбхаÑки -Name[mn]=Ðбкааз -Name[ms]=Abkhazia -Name[nb]=Abkhasisk -Name[nds]=Abchaassch -Name[ne]=अबà¥à¤–ाजियन -Name[nn]=Abkhasisk -Name[nso]=Se-Abkhazian -Name[pa]=ਅਬਖਾਜ਼ੀਨ -Name[pl]=Abchaski -Name[pt_BR]=Turco -Name[ro]=Abhaziană -Name[ru]=ÐбхазÑкий -Name[rw]=Abukaziyani -Name[se]=Abhásiagiella -Name[sk]=abcházÄina -Name[sl]=abkazijansko -Name[sq]=Abkhazanisht -Name[sr]=ÐбхазијÑки -Name[sr@Latn]=Abhazijski -Name[ss]=Si-Abkhazian -Name[sv]=Abkhasiska -Name[ta]=அபà¯à®•à®¾à®šà®¿à®¯à®©à¯ -Name[te]=à°…à°¬à±à°–జియనౠ-Name[tg]=Ðбхозӣ -Name[th]=ภาษาà¹à¸à¸šà¸„าเซียน -Name[tt]=Abxazça -Name[uk]=Ðбхазька -Name[uz]=Abxazcha -Name[uz@cyrillic]=Ðбхазча -Name[vi]=Ap-kha-xi-an -Name[wa]=Abxhaze -Name[zh_CN]=é˜¿å¸ƒå“ˆè¥¿äºšè¯ -Name[zh_HK]=阿布哈西亞語 -Name[zh_TW]=阿布哈西亞語 -Name[zu]=I-Abkhazian [ae] Name=Avestan -Name[ar]=أيراني Ø£Ùستان -Name[az]=Avestanca -Name[be]=ÐвеÑтанÑÐºÐ°Ñ -Name[bg]=ÐвеÑтийÑки -Name[bn]=আà¦à§‡à¦¸à§à¦¤à¦¾à¦¨ -Name[cs]=Avestánský -Name[csb]=AwestaÅ„sczi (iraÅ„sczi) -Name[cy]=Afestaneg -Name[da]=Avestansk -Name[de]=Avestisch -Name[eo]=Avesta -Name[et]=Vanapärsia -Name[fa]=اوستایی -Name[fi]=Avesta -Name[fy]=Avestaansk -Name[ga]=Aivéistis -Name[gl]=Avestani -Name[he]=×ווסטית -Name[hi]=अवेसà¥à¤¤à¤¨ -Name[hr]=Avestanski -Name[hsb]=Awestisce -Name[hu]=Avesztáni -Name[it]=Avestano -Name[ja]=アベスタ語 -Name[ka]=áƒáƒ•áƒ”სტური -Name[kk]=ÐвеÑтша -Name[km]=អាវែស្ážáž„់ -Name[ko]=ì•„ë² ìŠ¤íƒ„ì–´ -Name[mk]=ÐвеÑтан -Name[mn]=ÐвеÑтан -Name[nb]=Avestisk -Name[nds]=Avesta -Name[ne]=अà¤à¥‡à¤¸à¥à¤Ÿà¤¨ -Name[nn]=Avestisk -Name[nso]=Se-Avestan -Name[pa]=ਅਵਸਟਅਨ -Name[pl]=AwestaÅ„ski (IraÅ„ski) -Name[ro]=Avestană -Name[ru]=ÐвеÑтийÑкий -Name[rw]=Ikinyavesitani -Name[se]=Avestánagiella -Name[sk]=avestÄina -Name[sl]=avestansko -Name[sq]=Avestanisht -Name[sr]=ÐвеÑтанÑки -Name[sr@Latn]=Avestanski -Name[ss]=Si-Avestan -Name[sv]=Avestiska -Name[ta]=அவெஸà¯à®¤à®©à¯ -Name[te]=అవెసà±à°¥à°¨à± -Name[tg]=ÐваÑтоӣ -Name[th]=ภาษาà¸à¸°à¹€à¸§à¸ªà¹à¸—น -Name[tt]=Avestança -Name[uk]=ÐвеÑтан -Name[uz]=Avesta -Name[uz@cyrillic]=ÐвеÑта -Name[vi]=Ä‚-ve-x-tanh -Name[zh_CN]=é˜¿ç»´æ–¯é™€è¯ -Name[zh_HK]=阿ç¶æ–¯é™€èªž -Name[zh_TW]=阿ç¶æ–¯é™€èªž -Name[zu]=Isi-Avestan [af] Name=Afrikaans -Name[ar]=الأÙريكانس -Name[az]=Afrika Dili -Name[be]=ÐфрыканÑÐºÐ°Ñ -Name[bg]=ÐÑ„Ñ€Ð¸ÐºÐ°Ð°Ð½Ñ -Name[bn]=আফà§à¦°à¦¿à¦•à¦¾à¦¨à§â€Œà¦¸ -Name[cs]=Afrikánský -Name[csb]=Afrikanersczi -Name[cy]=Affricaneg -Name[el]=ΑφÏικανικά -Name[eo]=Afrikansa -Name[et]=Afrikaani -Name[eu]=Afrikaansa -Name[fa]=Ø¢Ùریکانس -Name[fy]=Afrikaansk -Name[ga]=Afracáinis -Name[gl]=Africáner -Name[he]=××¤×¨×™×§× ×¡ -Name[hi]=अफà¥à¤°à¥€à¤•à¤¨à¥à¤¸ -Name[id]=Afrika -Name[ja]=アフリカーンス語 -Name[ka]=áƒáƒ¤áƒ იკáƒáƒáƒœáƒ¡áƒ˜ -Name[kk]=ÐÐ°Ñ„Ñ€Ð¸ÐºÐ°Ð°Ð½Ñ -Name[km]=អាហ្វ្រីកាអាន -Name[ko]=남아프리카 공용어 -Name[lt]=Afrikanso -Name[lv]=Ä€frikÄņu -Name[mi]=Reo Äwherika Tatimana -Name[mk]=ÐфриканÑки -Name[mn]=Ðфрик -Name[ms]=Afrika -Name[mt]=Afrikans -Name[nds]=Afrikaansch -Name[ne]=अफà¥à¤°à¤¿à¤•à¥€ -Name[nso]=Seburu -Name[pa]=ਅਫਰੀਕਨ -Name[pl]=Afrykanerski -Name[pt_BR]=Africâners -Name[ro]=Africană -Name[ru]=ÐÑ„Ñ€Ð¸ÐºÐ°Ð°Ð½Ñ -Name[rw]=Ikinyafurikansi -Name[se]=Afrikánsgiella -Name[sk]=afrikánÄina -Name[sl]=afrikansko -Name[sq]=Afrikanisht -Name[sr]=ÐфриканерÑки -Name[sr@Latn]=Afrikanerski -Name[ss]=Sibhunu -Name[sv]=Sydafrikansk holländska -Name[ta]=ஆஃபரிகானà¯à®¸à¯ -Name[te]=ఆఫà±à°°à°¿à°•à°¾à°¨à±à°¸à± -Name[tg]=Ðфрикоӣ -Name[th]=ภาษาà¹à¸à¸Ÿà¸£à¸´à¸à¸² -Name[tr]=Afrika Dili -Name[tt]=Afrikança -Name[uk]=ПівденноафриканÑька -Name[uz]=Afrikancha -Name[uz@cyrillic]=Ðфриканча -Name[ven]=Tshivhuru -Name[vi]=Hoà Nam Phi -Name[xh]=Isibhulu -Name[zh_CN]=å—éžè·å…°è¯ -Name[zh_HK]=å—éžè·è˜èªž -Name[zh_TW]=å—éžè·è˜èªž -Name[zu]=Isi-Bhunu [am] Name=Amharic -Name[ar]=أمهري -Name[az]=AmharikcÉ™ -Name[be]=ÐмхарÑÐºÐ°Ñ -Name[bg]=ÐмхарÑки -Name[bn]=আমহারিক -Name[br]=Amhareg -Name[bs]=Amharski -Name[ca]=Amhà ric -Name[cs]=Amharský -Name[csb]=Etiopsczi -Name[cy]=Amhareg -Name[da]=Amharisk -Name[de]=Amharisch -Name[eo]=Amhara -Name[es]=Amárico -Name[et]=Amhaara -Name[fa]=امهری -Name[fi]=Amhara -Name[fr]=Amharique -Name[fy]=Amhaarsk -Name[ga]=Amáiris -Name[he]=×מהרית -Name[hi]=अमà¥à¤¹à¤¾à¤°à¤¿à¤• -Name[hr]=Amarski -Name[hsb]=Amharisce -Name[hu]=Amhár -Name[it]=Amarico -Name[ja]=アムãƒãƒ©èªž -Name[ka]=áƒáƒ›áƒ°áƒáƒ ული -Name[kk]=Ðхмарша -Name[km]=អាមហារី -Name[ko]=암하ë¼ì–´ -Name[lb]=Amharesch -Name[lt]=Amhari -Name[lv]=AmarieÅ¡u -Name[mk]=ÐмхарÑки -Name[mn]=Ðмхар -Name[nb]=Amharisk -Name[nds]=Amhaarsch -Name[ne]=अमà¥à¤¹à¤¾à¤°à¤¿à¤• -Name[nl]=Amharisch -Name[nn]=Amharisk -Name[nso]=Se-Amharic -Name[pa]=ਅਮਹਾਰਿਕ -Name[pl]=Etiopski -Name[pt]=Amárico -Name[pt_BR]=Amârico -Name[ro]=Amarică -Name[ru]=ÐмхарÑкий -Name[rw]=Ikinyamarike -Name[se]=Ambháriagiella -Name[sk]=amharÄina -Name[sl]=amharik -Name[sq]=Amharikisht -Name[sr]=ÐмарÑки -Name[sr@Latn]=Amarski -Name[ss]=Si-Amharic -Name[sv]=Amarinja -Name[ta]=à®…à®®à¯à®¹à®¾à®°à®¿à®•à¯ -Name[te]=à°…à°®à±à°¹à°°à°¿à°•à± -Name[tg]=Ðмхарикӣ -Name[th]=ภาษาà¸à¸±à¸¡à¸®à¸²à¸£à¸´à¸„ -Name[tt]=Amharça -Name[uk]=ÐмхарÑька -Name[uz]=Amxarik -Name[uz@cyrillic]=Ðмхарик -Name[vi]=Am-ha-ri -Name[zh_CN]=é˜¿å§†å“ˆæ‹‰è¯ -Name[zh_HK]=衣索比亞官方語 -Name[zh_TW]=衣索比亞官方語 -Name[zu]=isi-Amharic [ar] Name=Arabic -Name[af]=Arabies -Name[ar]=العربية -Name[az]=ÆrabcÉ™ -Name[be]=ÐрабÑÐºÐ°Ñ -Name[bg]=ÐрабÑки -Name[bn]=আরবী -Name[br]=Arabeg -Name[bs]=Arapski -Name[ca]=Àrab -Name[cs]=Arabský -Name[csb]=Arabsczi -Name[cy]=Arabeg -Name[da]=Arabisk -Name[de]=Arabisch -Name[el]=ΑÏαβικά -Name[eo]=Araba -Name[es]=Arábe -Name[et]=Araabia -Name[eu]=Arabiera -Name[fa]=عربی -Name[fi]=Arabia -Name[fr]=Arabe -Name[fy]=Arabysk -Name[ga]=Araibis -Name[gl]=Ãrabe -Name[he]=ערבית -Name[hi]=अरेबिक -Name[hr]=Arapski -Name[hsb]=Arabsce -Name[hu]=Arab -Name[id]=Arab -Name[is]=ArabÃska -Name[it]=Arabo -Name[ja]=アラビア語 -Name[ka]=áƒáƒ áƒáƒ‘ული -Name[kk]=Ðрабша -Name[km]=អារ៉ាប់ -Name[ko]=ì•„ë¼ë¹„ì•„ì–´ -Name[lb]=Arabesch -Name[lt]=Arabų -Name[lv]=ArÄbu -Name[mi]=Reo Arapia -Name[mk]=ÐрапÑки -Name[mn]=Ðраб -Name[ms]=Arab -Name[mt]=Għarbi -Name[nb]=Arabisk -Name[nds]=Araabsch -Name[ne]=अरबी -Name[nl]=Arabisch -Name[nn]=Arabisk -Name[nso]=Searapo -Name[oc]=Arab -Name[pa]=ਅਰਬੀ -Name[pl]=Arabski -Name[pt]=Ãrabe -Name[pt_BR]=Ãrabe -Name[ro]=Arabă -Name[ru]=ÐрабÑкий -Name[rw]=Icyarabu -Name[se]=Arábiagiella -Name[sk]=arabÄina -Name[sl]=arabsko -Name[sq]=Arabisht -Name[sr]=ÐрапÑки -Name[sr@Latn]=Arapski -Name[ss]=Si-Arabhu -Name[sv]=Arabiska -Name[ta]=அராபிக௠-Name[te]=అరబికౠ-Name[tg]=Ðрабӣ -Name[th]=ภาษาà¸à¸²à¸£à¸šà¸´à¸ -Name[tr]=Arapça -Name[tt]=Ğäräpçä -Name[uk]=ÐрабÑька -Name[uz]=Arabcha -Name[uz@cyrillic]=Ðрабча -Name[ven]=Tshiarabiki -Name[vi]=A-ráºp -Name[wa]=Arabe -Name[zh_CN]=é˜¿æ‹‰ä¼¯è¯ -Name[zh_HK]=阿拉伯語 -Name[zh_TW]=阿拉伯語 -Name[zu]=Isi-Arabhu [as] Name=Assamese -Name[ar]=هندي أساميزي -Name[az]=AssamescÉ™ -Name[be]=ÐÑамÑÐºÐ°Ñ -Name[bg]=ÐÑами -Name[bn]=আসামী -Name[bs]=Asamski -Name[ca]=Assamès -Name[cs]=Asamský -Name[csb]=Assamijsczi -Name[cy]=Assameg -Name[de]=Assamesisch -Name[eo]=Asama -Name[et]=Assami -Name[fa]=آسامی -Name[fi]=Assami -Name[fr]=Assamais -Name[fy]=Assameesk -Name[ga]=Asaimis -Name[gl]=Asamixa -Name[he]=×סמית -Name[hi]=असमी -Name[hr]=Asamski -Name[hsb]=Asamezisce -Name[hu]=Asszámi -Name[ja]=アッサム語 -Name[ka]=áƒáƒ¡áƒáƒ›áƒ”სე -Name[kk]=ÐÑÑамша -Name[km]=អាសាមីស -Name[ko]=아삼어 -Name[lb]=Assamesesch -Name[lt]=Asamesų -Name[lv]=AsamieÅ¡u -Name[mk]=ÐÑамеÑки -Name[mn]=ÐÑÑаме -Name[nb]=Assamesisk -Name[nds]=Assameesch -Name[ne]=आसामी -Name[nl]=Assamees -Name[nn]=Assami -Name[nso]=Se-Assamese -Name[pa]=ਆਸਾਮੀ -Name[pl]=Assamijski -Name[ro]=Asameză -Name[ru]=ÐÑÑамÑкий -Name[rw]=Ikinyasamese -Name[se]=Assamesegiella -Name[sk]=ásámÄina -Name[sl]=asamese -Name[sq]=Assamesisht -Name[sr]=ÐÑамÑки -Name[sr@Latn]=Asamski -Name[ss]=Si-Assamese -Name[sv]=Assamesiska -Name[ta]=அஸà¯à®¸à®¾à®®à®¿à®¯ -Name[te]=à°…à°¸à±à°¸à°¾à°®à±€ -Name[tg]=ÐÑÑамӣ -Name[th]=ภาษาà¸à¸±à¸ªà¸ªà¸±à¸¡ -Name[tt]=Assamesçä -Name[uk]=ÐÑамійÑька -Name[uz@cyrillic]=ÐÑÑамеÑе -Name[vi]=A-xam -Name[zh_CN]=阿è¨å§†è¯ -Name[zh_HK]=阿薩姆語 -Name[zh_TW]=阿薩姆語 -Name[zu]=Isi-Assamese [ay] Name=Aymara -Name[ar]=هندي من سكان بوليÙيا والبيرو -Name[az]=Aymaraca -Name[be]=ÐймарÑÐºÐ°Ñ -Name[bg]=Ðймара -Name[bn]=আইমারা -Name[cy]=Aimareg -Name[de]=Aimara -Name[eo]=Ajmara -Name[et]=Aimaraa -Name[fa]=آیمارایی -Name[fi]=Aimara -Name[ga]=Adhmarais -Name[gl]=Aimará -Name[he]=×יימרה -Name[hi]=अयमारा -Name[hr]=Ajmarski -Name[hu]=Ajmara -Name[ja]=アイマラ語 -Name[ka]=áƒáƒ˜áƒ›áƒáƒ რ-Name[kk]=Ðймарша -Name[km]=អីម៉ារ៉ា -Name[ko]=ì•„ì´ë§ˆë¼ì–´ -Name[lb]=Aimara -Name[lv]=Ajmaru -Name[mk]=Ðјмара -Name[mn]=ÐÑмара -Name[ne]=आइमारा -Name[nso]=Se-Aymara -Name[pa]=ਅਯਮਾਰਾ -Name[ro]=Aymară -Name[ru]=ÐймарÑкий -Name[rw]=Ikinyayimara -Name[se]=Aimáragiella -Name[sk]=aymarÄina -Name[sl]=ajmarsko -Name[sq]=Ajmarisht -Name[sr]=ÐјмарÑки -Name[sr@Latn]=Ajmarski -Name[ss]=Si-Aymara -Name[ta]=அயà¯à®®à®¾à®°à®¾ -Name[te]=à°…à°¯à±à°®à°°à°¾ -Name[tg]=Ðймарагӣ -Name[th]=ภาษาà¸à¸±à¸¢à¸¡à¸²à¸£à¸² -Name[tt]=Aymarça -Name[uk]=ÐймарÑька -Name[uz@cyrillic]=Ðймара -Name[vi]=Ay-ma-ra -Name[zh_CN]=è‰¾é©¬æ‹‰è¯ -Name[zh_HK]=愛瑪拉語 -Name[zh_TW]=愛瑪拉語 -Name[zu]=Isi-Aymara [az] Name=Azerbaijani -Name[ar]=الأذربيجانية -Name[az]=AzÉ™rbaycanca -Name[be]=ÐзербайджанÑÐºÐ°Ñ -Name[bg]=ÐзербайджанÑки -Name[bn]=আজেরবাইজানি -Name[br]=Azerbaidjanek -Name[bs]=Azerbejdžanski -Name[ca]=Àzeri -Name[cs]=Ãzerbajdžánský -Name[csb]=AzerbejdżaÅ„sczi -Name[cy]=Azerbaijaneg -Name[da]=Azerbaijansk -Name[de]=Aserbaidschanisch -Name[el]=ΑζεÏμπαϊτζανικά -Name[eo]=AzerbajÄana -Name[es]=Azerbayano -Name[et]=Aserbaidžaani -Name[eu]=Azerbaijanera -Name[fa]=آذربایجانی -Name[fi]=Azerbaidžani -Name[fr]=Azerbaïdjanais -Name[fy]=Azerbeidzjaansk -Name[ga]=Asarbaiseáinis -Name[gl]=Azeri -Name[he]=×זרביג'× ×™×ª -Name[hi]=अजरबैजानी -Name[hr]=Azerbejdžanski -Name[hsb]=Azerbajdźansce -Name[hu]=Azerbajdzsán -Name[id]=Azerbaijan -Name[is]=Azerbaijanska -Name[it]=Azerbaigiano -Name[ja]=アゼルãƒã‚¤ã‚¸ãƒ£ãƒ³èªž -Name[ka]=áƒáƒ–ერბáƒáƒ˜áƒ¯áƒáƒœáƒ£áƒšáƒ˜ -Name[kk]=Ðзербайжанша -Name[km]=អាហ្ស៊ែរបែហ្សង់ -Name[ko]=ì•„ì œë¥´ë°”ì´ìž”ì–´ -Name[lb]=Asserbaidschanesch -Name[lt]=AzerbaidžanieÄių -Name[lv]=AzerbaidžÄņu -Name[mk]=ÐзербејџанÑки -Name[mn]=Ðзербажайн -Name[ms]=Azerbaijan -Name[mt]=AżerbajÄ¡ani -Name[nb]=Aserbajdsjansk -Name[nds]=Aserbaidschaansch -Name[ne]=अजरबैजानी -Name[nl]=Azerbeidjaans -Name[nn]=Aserbajdsjansk -Name[nso]=Se-Azerbaijani -Name[pa]=ਅਜ਼ਰਬਾਈਜਾਨੀ -Name[pl]=AzerbejdżaÅ„ski -Name[pt]=Azerbaijano -Name[pt_BR]=Azerbaijão -Name[ro]=Azerbaijană -Name[ru]=ÐзербайджанÑкий -Name[rw]=Ikinyazeribayijani -Name[se]=Azerbaižánagiella -Name[sk]=azerbajdžanÄina -Name[sl]=azerbajdžansko -Name[sq]=Azerbejxhanisht -Name[sr]=ÐзербејџанÑки -Name[sr@Latn]=Azerbejdžanski -Name[ss]=Si-Azerbaijani -Name[sv]=Azerbajdzjanska -Name[ta]=அசரà¯à®ªà¯ˆà®šà®¾à®©à®¿ -Name[te]=అజెరౠబైజాని -Name[tg]=Озарбойҷонӣ -Name[th]=ภาษาà¸à¸²à¹€à¸‹à¸à¸£à¹Œà¹„บจัน -Name[tr]=Azerbeycanca -Name[tt]=Äzerçä -Name[uk]=ÐзербайджанÑька -Name[uz]=Ozarbayjoncha -Name[uz@cyrillic]=Озарбайжонча -Name[vi]=A-xợ-bai-gianh -Name[wa]=Azeri -Name[zh_CN]=é˜¿å¡žæ‹œç–†è¯ -Name[zh_HK]=亞塞拜彊語 -Name[zh_TW]=亞塞拜然語 -Name[zu]=Isi-Azerbaijani [ba] Name=Bashkir -Name[ar]=بشكير -Name[az]=BaÅŸkircÉ™ -Name[be]=БашкірÑÐºÐ°Ñ -Name[bg]=БашкирÑки -Name[bn]=বাশকীর -Name[bs]=BaÅ¡kir -Name[cs]=BaÅ¡kirský -Name[csb]=Baszkirsczi -Name[cy]=Bashkireg -Name[de]=Baschkirisch -Name[eo]=BaÅkira -Name[et]=BaÅ¡kiiri -Name[fa]=بشکیری -Name[fi]=BaÅ¡kiiri -Name[fr]=Bachkir -Name[ga]=BaiscÃris -Name[gl]=Bashquir -Name[he]=בשקירית -Name[hi]=बाशकिर -Name[hr]=BaÅ¡kirski -Name[hu]=BaskÃr -Name[ja]=ãƒã‚·ãƒ¥ã‚ール語 -Name[ka]=ბáƒáƒ¨áƒ™áƒ˜áƒ ული -Name[kk]=Башкұртша -Name[km]=បាសគៀរ -Name[ko]=바시킬어 -Name[lb]=Baschkiresch -Name[lt]=BaÅ¡kirų -Name[lv]=BaÅ¡kÄ«ru -Name[mk]=Башкир -Name[mn]=Башкир -Name[nds]=Baschkiirsch -Name[ne]=बासà¥à¤•à¤¿à¤° -Name[nn]=Basjkirsk -Name[nso]=Se-Bashkir -Name[pa]=ਬਸਕੀਰ -Name[pl]=Baszkirski -Name[ro]=BaÅŸchiră -Name[ru]=БашкирÑкий -Name[rw]=Ikinyabashikiri -Name[se]=BaÅ¡kiriagiella -Name[sk]=baÅ¡kirÄina -Name[sl]=baÅ¡kirsko -Name[sq]=Bashkirisht -Name[sr]=БашкирÑки -Name[sr@Latn]=BaÅ¡kirski -Name[ss]=Si-Bashkir -Name[ta]=பாகà¯à®·à¯€à®°à¯ -Name[te]=బాషà±à°•à°¿à°°à± -Name[tg]=Бошқирдӣ -Name[th]=ภาษาà¹à¸šà¸Šà¹€à¸„ียร์ -Name[tt]=BaÅŸqortça -Name[uk]=БашкирÑька -Name[uz]=Boshqircha -Name[uz@cyrillic]=Бошқирча -Name[vi]=Ba-x-kia -Name[zh_CN]=å·´ä»€åŸºå°”è¯ -Name[zh_HK]=Bashkir語 -Name[zh_TW]=Bashkir語 -Name[zu]=Isi-Bashkir [be] Name=Belarusian -Name[ar]=بلاروسي -Name[az]=Belarusca -Name[be]=БеларуÑÐºÐ°Ñ -Name[bg]=БелоруÑки -Name[bn]=বেলারà§à¦¶à¦¿à§Ÿ -Name[br]=Belarusieg -Name[bs]=Bjeloruski -Name[ca]=Bielorús -Name[cs]=BÄ›loruský -Name[csb]=BiaÅ‚orusczi -Name[cy]=Belarwsieg -Name[da]=Hviderussisk -Name[de]=Weißrussisch -Name[el]=ΛευκοÏωσικά -Name[eo]=Bjelorusa -Name[es]=Bieloruso -Name[et]=Valgevene -Name[eu]=Bielorrusiera -Name[fa]=بلاروسی -Name[fi]=Valkovenäjä -Name[fr]=Bélarus -Name[fy]=Wyt-Russysk -Name[ga]=Bealarúisis -Name[gl]=Bielorruso -Name[he]=בלרוסית -Name[hi]=बेलारूसियन -Name[hr]=Bjeloruski -Name[hsb]=Běłorusce -Name[hu]=Belorusz -Name[id]=Belarusia -Name[is]=HvÃta-Rússneska -Name[it]=Bielorusso -Name[ja]=ベラルーシ語 -Name[ka]=ბელáƒáƒ უსული -Name[kk]=БелоруÑша -Name[km]=áž”áŸáž¡áž¶ážšáž»ážŸáŸ’ស -Name[ko]=백러시아어 -Name[lb]=Wéisrussesch -Name[lt]=Baltarusių -Name[lv]=Baltkrievu -Name[mk]=БелоруÑки -Name[mn]=БеларуÑÑ -Name[ms]=Belarusia -Name[mt]=Bjelorussu -Name[nb]=Hviterussisk -Name[nds]=Wittruss'sch -Name[ne]=बेलारसियाली -Name[nl]=Wit-Rusland -Name[nn]=Kviterussisk -Name[nso]=Se-Belarusian -Name[pa]=ਬੇਲਾਰੂਸ -Name[pl]=BiaÅ‚oruski -Name[pt]=Bielorrusso -Name[pt_BR]=Bielo-Russo -Name[ro]=Belarusă -Name[ru]=БелоруÑÑкий -Name[rw]=Ikibelarusiya -Name[se]=VilgesruoÅ¡Å¡agiella -Name[sk]=bieloruÅ¡tina -Name[sl]=belorusko -Name[sq]=Bellorusisht -Name[sr]=БелоруÑки -Name[sr@Latn]=Beloruski -Name[ss]=Si-Belarusian -Name[sv]=Vitryska -Name[ta]=பெலாரூசியன௠-Name[te]=బెలరషియనౠ-Name[tg]=БелоруÑÓ£ -Name[th]=ภาษาเบลารุสเซีย -Name[tr]=Belarus Dili -Name[tt]=Belarusça -Name[uk]=БілоруÑька -Name[uz]=Beloruscha -Name[uz@cyrillic]=БелоруÑча -Name[vi]=Be-la-ru-xợ -Name[wa]=Bielorûsse -Name[zh_CN]=ç™½ä¿„ç½—æ–¯è¯ -Name[zh_HK]=白俄羅斯語 -Name[zh_TW]=白俄羅斯語 -Name[zu]=Isi-Belarusian [bg] Name=Bulgarian -Name[af]=Bulgaars -Name[ar]=البلغارية -Name[az]=Bolqarca -Name[be]=БалгарÑÐºÐ°Ñ -Name[bg]=БългарÑки -Name[bn]=বà§à¦²à¦—েরিয় -Name[br]=Bulgareg -Name[bs]=Bugarski -Name[ca]=Búlgar -Name[cs]=Bulharský -Name[csb]=Bùlgarsczi -Name[cy]=Bwlgareg -Name[da]=Bulgarsk -Name[de]=Bulgarisch -Name[el]=ΒουλγαÏικά -Name[eo]=Bulgara -Name[es]=Búlgaro -Name[et]=Bulgaaria -Name[eu]=Bulgariera -Name[fa]=بلغاری -Name[fi]=Bulgaria -Name[fr]=Bulgare -Name[fy]=Bulgaarsk -Name[ga]=Bulgáiris -Name[gl]=Búlgaro -Name[he]=בולגרית -Name[hi]=बलà¥à¤—ारियन -Name[hr]=Bugarski -Name[hsb]=BoÅ‚harsce -Name[hu]=Bolgár -Name[id]=Bulgaria -Name[is]=Búlgarska -Name[it]=Bulgaro -Name[ja]=ブルガリア語 -Name[ka]=ბულგáƒáƒ ული -Name[kk]=Болғарша -Name[km]=ប៊ុលហ្ការី -Name[ko]=불가리아어 -Name[lb]=Bulgaresch -Name[lt]=Bulgarų -Name[lv]=BulgÄru -Name[mi]=Reo Purukeria -Name[mk]=БугарÑки -Name[mn]=Болгар -Name[ms]=Bulgaria -Name[mt]=Bulgaru -Name[nb]=Bulgarsk -Name[nds]=Bulgaarsch -Name[ne]=बà¥à¤²à¥à¤—ेरियाली -Name[nl]=Bulgaars -Name[nn]=Bulgarsk -Name[nso]=Se-Bulgarian -Name[oc]=Bulgar -Name[pa]=ਬà©à¨²à¨—ਾਰੀਆ -Name[pl]=BuÅ‚garski -Name[pt]=Búlgaro -Name[pt_BR]=Búlgaro -Name[ro]=Bulgară -Name[ru]=БолгарÑкий -Name[rw]=Ikinyabulugariya -Name[se]=Bulgáriagiella -Name[sk]=bulharÄina -Name[sl]=bolgarsko -Name[sq]=Bullgarisht -Name[sr]=БугарÑки -Name[sr@Latn]=Bugarski -Name[ss]=Si-Bulgarian -Name[sv]=Bulgariska -Name[ta]=பலà¯à®•à¯‡à®°à®¿à®¯à®©à¯ -Name[te]=బలà±à°—ెరియనౠ-Name[tg]=Булғорӣ -Name[th]=ภาษาบัลà¹à¸à¹€à¸£à¸µà¸¢ -Name[tr]=Bulgarca -Name[tt]=Bulgarça -Name[uk]=БолгарÑька -Name[uz]=Bolgarcha -Name[uz@cyrillic]=Болгарча -Name[vi]=Bảo-gia-lÆ¡i -Name[wa]=BulgÃ¥re -Name[zh_CN]=ä¿åŠ åˆ©äºšè¯ -Name[zh_HK]=ä¿åŠ 利亞語 -Name[zh_TW]=ä¿åŠ 利亞語 -Name[zu]=Isi-Bulgarian [bh] Name=Bihari -Name[ar]=بهاري -Name[az]=BiharicÉ™ -Name[be]=БіхарÑÐºÐ°Ñ -Name[bg]=Бихари -Name[bn]=বিহারী -Name[ca]=Biharà -Name[cy]=Bihareg -Name[de]=Biharisch -Name[fa]=بیهاری -Name[fy]=Bihary -Name[ga]=Bihairis -Name[he]=ביהרי -Name[hi]=बिहारी -Name[hr]=Biharski -Name[ja]=ビãƒãƒ¼ãƒ«èªž -Name[ka]=ბიჰáƒáƒ ი -Name[kk]=Бихарша -Name[km]=បិហារ -Name[ko]=비하르어 -Name[lb]=Biharesch -Name[mk]=Бихари -Name[mn]=Бихари -Name[ne]=बिहारी -Name[nso]=Se-Bihari -Name[pa]=ਬਿਹਾਰੀ -Name[ru]=БихарÑкий -Name[rw]=Ikibihari -Name[se]=Biháragiella -Name[sk]=bihárske jazyky -Name[sl]=bihari -Name[sq]=Biharisht -Name[sr]=БихарÑки -Name[sr@Latn]=Biharski -Name[ss]=Si-Bihari -Name[ta]=பீகாரி -Name[te]=బిహారి -Name[tg]=Бихарӣ -Name[th]=ภาษาบิฮาริ -Name[tt]=Biharça -Name[uk]=Біхарі -Name[uz]=Bixari -Name[uz@cyrillic]=Бихари -Name[vi]=Bi-ha-ri -Name[zh_CN]=æ¯”å“ˆé‡Œè¯ -Name[zh_HK]=比哈爾語 -Name[zh_TW]=比哈爾語 -Name[zu]=Isi-Bihari [bi] Name=Bislama -Name[ar]=بيسلاما -Name[az]=Bislamaca -Name[be]=БіÑламÑÐºÐ°Ñ -Name[bg]=БиÑлама -Name[bn]=বিসলামা -Name[cy]=Bislameg -Name[fa]=بیسلاما -Name[fr]=Bichlamar -Name[ga]=Bioslamais -Name[he]=ביסלמה -Name[hi]=बिसà¥à¤²à¤¾à¤®à¤¾ -Name[hr]=Bislamski -Name[hu]=Biszlama -Name[ja]=ビスラマ語 -Name[ka]=ბისლáƒáƒ›áƒ -Name[kk]=БиÑамша -Name[km]=បីសឡាម៉ា -Name[ko]=비슬ë¼ë§ˆì–´ -Name[mk]=БиÑлама -Name[mn]=БиÑлам -Name[ne]=बिसà¥à¤²à¤¾à¤®à¤¾ -Name[nso]=Se-Bislama -Name[pa]=ਬਿਸਲਾਮਾ -Name[ru]=БиÑлама -Name[rw]=Ikibisilamu -Name[se]=Bislamagiella -Name[sk]=bislama -Name[sl]=bislama -Name[sq]=Bislamisht -Name[sr]=БиÑламÑки -Name[sr@Latn]=Bislamski -Name[ss]=Si-Bislama -Name[ta]=பிஸà¯à®²à®¾à®®à®¾ -Name[te]=బిసà±à°²à°®à°¾ -Name[tg]=БиÑлама -Name[th]=ภาษาบิสลามา -Name[tt]=Bislamaça -Name[uk]=БіÑлама -Name[uz@cyrillic]=БиÑлама -Name[vi]=Bit-la-ma -Name[zh_CN]=æ¯”æ–¯æ‹‰é©¬è¯ -Name[zh_HK]=Bislama語 -Name[zh_TW]=Bislama語 -Name[zu]=Isi-Bislama [bn] Name=Bengali -Name[ar]=بنغالي -Name[az]=Benqalca -Name[be]=БенгальÑÐºÐ°Ñ -Name[bg]=Бенгали -Name[bn]=বাংলা -Name[br]=Bangali -Name[bs]=Bengalski -Name[ca]=Bengalà -Name[cs]=Bengálský -Name[csb]=Bengalsczi -Name[cy]=Bengaleg -Name[eo]=Bengala -Name[es]=Bengalà -Name[eu]=Bengalera -Name[fa]=بنگلادشی -Name[fy]=Bengaalsk -Name[ga]=Beangáilis -Name[he]=×‘× ×’×œ×™×ª -Name[hi]=बंगाली -Name[hr]=Bengalski -Name[hsb]=Bengalsce -Name[hu]=Bengáli -Name[is]=Bengalst -Name[it]=Bengalese -Name[ja]=ベンガル語 -Name[ka]=ბენგáƒáƒšáƒ˜ -Name[kk]=Бенгали -Name[km]=áž”áŸáž“្កាលី -Name[ko]=벵갈어 -Name[lb]=Bengalesch -Name[lt]=Bengalų -Name[lv]=BengÄļu -Name[mk]=БенгалÑки -Name[mn]=Бенгали -Name[nds]=Bengaalsch -Name[ne]=बङà¥à¤—ाली -Name[nso]=Se-Bengali -Name[pa]=ਬੰਗਾਲੀ -Name[pl]=Bengalski -Name[ru]=Бенгали -Name[rw]=Ikibengali -Name[se]=Bengalagiella -Name[sk]=bengálÄina -Name[sl]=bengalsko -Name[sq]=Bengalisht -Name[sr]=БенгалÑки -Name[sr@Latn]=Bengalski -Name[ss]=Si-Bengali -Name[ta]=பெஙà¯à®•à®¾à®²à®¿ -Name[te]=బెంగాలి -Name[tg]=Бенголӣ -Name[th]=ภาษาเบงà¸à¸²à¸¥à¸µ -Name[tr]=Bengal -Name[tt]=Bengalça -Name[uk]=БенгальÑька -Name[uz]=Bengalcha -Name[uz@cyrillic]=Бенгалча -Name[vi]=Ben-ga-li -Name[zh_CN]=åŸåŠ æ‹‰è¯ -Name[zh_HK]=åŸåŠ 拉語 -Name[zh_TW]=åŸåŠ 拉語 -Name[zu]=Isi-Bengali [bo] Name=Tibetan -Name[ar]=تبتي -Name[az]=TibetcÉ™ -Name[be]=Ð¢Ñ‹Ð±ÐµÑ†ÐºÐ°Ñ -Name[bg]=ТибетÑки -Name[bn]=তিবà§à¦¬à¦¤à§€ -Name[br]=Yezh an Tibet -Name[bs]=Tibetanski -Name[ca]=Tibetà -Name[cs]=Tibetský -Name[csb]=TibetaÅ„sczi -Name[cy]=Tibeteg -Name[da]=Tibetansk -Name[de]=Tibetisch -Name[el]=Θιβετιανά -Name[eo]=Tibeta -Name[es]=Tibetano -Name[et]=Tiibeti -Name[eu]=Tibetera -Name[fa]=تیبوتیایی -Name[fi]=Tiibet -Name[fr]=Tibétain -Name[fy]=Tibetaansk -Name[ga]=Tibéidis -Name[gl]=Tibetano -Name[he]=טיבטית -Name[hi]=तिबà¥à¤¤à¥€ -Name[hr]=Tibetanski -Name[hsb]=Tibetisce -Name[hu]=Tibeti -Name[id]=Tibet -Name[is]=TÃbeska -Name[it]=Tibetano -Name[ja]=ãƒãƒ™ãƒƒãƒˆèªž -Name[ka]=ტიბეტური -Name[kk]=Тибетше -Name[km]=ទីប០-Name[ko]=티벳어 -Name[lb]=Tibetanesch -Name[lt]=TibetieÄių -Name[lv]=TibetieÅ¡u -Name[mk]=ТибетанÑки -Name[mn]=Төвд -Name[ms]=Tibet -Name[nb]=Tibetansk -Name[nds]=Tibeetsch -Name[ne]=तिबà¥à¤¬à¤¤à¥€ -Name[nl]=Tibetaans -Name[nn]=Tibetansk -Name[nso]=Se-Tibetan -Name[pa]=ਤਿੱਬਤੀ -Name[pl]=TybetaÅ„ski -Name[pt]=Tibetano -Name[pt_BR]=Tibetano -Name[ro]=Tibetană -Name[ru]=ТибетÑкий -Name[rw]=Ikinyatibeti -Name[se]=Tibehtagiella -Name[sk]=tibetÄina -Name[sl]=tibetansko -Name[sq]=Tibetisht -Name[sr]=ТибетанÑки -Name[sr@Latn]=Tibetanski -Name[ss]=Si-Tibetan -Name[sv]=Tibetanska -Name[ta]=திபெதà¯à®¤à®¿à®¯à®©à¯ -Name[te]=టిబెటియనౠ-Name[tg]=Тибетӣ -Name[th]=ภาษาฑิเบต -Name[tt]=Tibetçä -Name[uk]=ТибетÑька -Name[uz]=Tibetcha -Name[uz@cyrillic]=Тибетча -Name[vi]=Tây-tạng -Name[wa]=Tibetyin -Name[zh_CN]=è—è¯ -Name[zh_HK]=è—語 -Name[zh_TW]=è—語 -Name[zu]=Isi-Tibetan [br] Name=Breton -Name[ar]=البريتون -Name[az]=Bretonca -Name[be]=БрÑтонÑÐºÐ°Ñ -Name[bg]=БретонÑки -Name[bn]=বà§à¦°à§‡à¦Ÿà¦¨ -Name[br]=Brezhoneg -Name[bs]=Bretonski -Name[ca]=Bretó -Name[cs]=Bretonský -Name[csb]=BretoÅ„sczi -Name[cy]=Llydaweg -Name[da]=Bretonsk -Name[de]=Bretonisch -Name[el]=Î’Ïετονικά -Name[eo]=Bretona -Name[es]=Bretón -Name[et]=Bretooni -Name[eu]=Bretoiera -Name[fa]=برتونیایی -Name[fi]=Bretoni -Name[fy]=Bretonsk -Name[ga]=Briotáinis -Name[gl]=Bretón -Name[he]=×‘×¨×˜×•× ×™×ª -Name[hi]=बà¥à¤°à¥‡à¤Ÿà¥‹à¤¨ -Name[hr]=Bretonski -Name[hsb]=Bretonisce -Name[is]=Bretánska -Name[it]=Bretone -Name[ja]=ブルトン語 -Name[ka]=ბრეტáƒáƒœáƒ£áƒšáƒ˜ -Name[kk]=Бретонша -Name[km]=ប្រឺážáž»áž„ -Name[ko]=브르타뉴어 -Name[lb]=Britesch -Name[lt]=Bretonų -Name[lv]=Bretoņu -Name[mi]=Reo Parani Uropi-Ãnia -Name[mk]=БретонÑки -Name[mn]=Бретон -Name[nb]=Bretonsk -Name[nds]=Bretoonsch -Name[ne]=बेलायती -Name[nl]=Bretoens -Name[nn]=Bretonsk -Name[nso]=Se-Breton -Name[oc]=Briton -Name[pa]=ਬਰੀਟੋਨ -Name[pl]=BretoÅ„ski -Name[pt]=Bretão -Name[pt_BR]=Bretão -Name[ro]=Bretonă -Name[ru]=БретонÑкий -Name[rw]=Ikinyabureto -Name[se]=Bretonagiella -Name[sk]=bretónÄina -Name[sl]=bretonsko -Name[sq]=Bretonisht -Name[sr]=БретонÑки -Name[sr@Latn]=Bretonski -Name[ss]=Si-Breton -Name[sv]=Bretonska -Name[ta]=பிரெடான௠-Name[te]=à°¬à±à°°à±†à°Ÿà°¨à± -Name[tg]=Бретонӣ -Name[th]=ภาษาเบรทตัน -Name[tr]=Britanya Dili -Name[tt]=Bretonça -Name[uk]=БретонÑька -Name[uz]=Bretoncha -Name[uz@cyrillic]=Бретонча -Name[vi]=Bợ-re-ton -Name[wa]=Burton -Name[zh_CN]=å¸ƒé‡Œå¤šå°¼è¯ -Name[zh_HK]=ä¸åˆ—塔尼語 -Name[zh_TW]=ä¸åˆ—塔尼語 -Name[zu]=Isi-Breton [bs] Name=Bosnian -Name[af]=Bosnies -Name[ar]=البوسنية -Name[az]=Bosnakca -Name[be]=БаÑнійÑÐºÐ°Ñ -Name[bg]=БоÑненÑки -Name[bn]=বসনীয় -Name[br]=Bosnieg -Name[bs]=Bosanski -Name[ca]=Bosnià -Name[cs]=Bosenský -Name[csb]=Bósniany -Name[cy]=Bosneg -Name[da]=Bosnisk -Name[de]=Bosnisch -Name[el]=Βοσνιακά -Name[eo]=Bosnia -Name[es]=Bosnio -Name[et]=Bosnia -Name[eu]=Bosniera -Name[fa]=بوسنیایی -Name[fi]=Bosnia -Name[fr]=Bosniaque -Name[fy]=Bosnysk -Name[ga]=Boisnis -Name[gl]=Bósnio -Name[he]=×‘×•×¡× ×™×ª -Name[hi]=बोसà¥à¤¨à¤¿à¤¯à¤¨ -Name[hr]=BoÅ¡njaÄki -Name[hsb]=Bosnisce -Name[hu]=Bosnyák -Name[id]=Bosnia -Name[is]=BosnÃska -Name[it]=Bosniaco -Name[ja]=ボスニア語 -Name[ka]=ბáƒáƒ¡áƒœáƒ˜áƒ£áƒ ი -Name[kk]=БоÑнаша -Name[km]=បូស្នី -Name[ko]=보스니아어 -Name[lb]=Bosnesch -Name[lt]=Bosnių -Name[lv]=BosnieÅ¡u -Name[mk]=БоÑанÑки -Name[mn]=БоÑни -Name[ms]=Bosnia -Name[mt]=Bożniaku -Name[nb]=Bosnisk -Name[nds]=Bosnisch -Name[ne]=बोसà¥à¤¨à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Bosnisch -Name[nn]=Bosnisk -Name[nso]=Se-Bosnian -Name[pa]=ਬੋਸਨੀਆ -Name[pl]=BoÅ›niacki -Name[pt]=Bósnio -Name[pt_BR]=Bósnio -Name[ro]=Bosniacă -Name[ru]=БоÑнийÑкий -Name[rw]=Ikinyabosiniya -Name[se]=Bosniagiella -Name[sk]=bosniaÄtina -Name[sl]=bosansko -Name[sq]=Boshnjakisht -Name[sr]=Бошњачки -Name[sr@Latn]=BoÅ¡njaÄki -Name[ss]=Si-Bosnian -Name[sv]=Bosniska -Name[ta]=பொஸà¯à®©à®¿à®¯à®©à¯ -Name[te]=బొసà±à°¨à°¿à°¯à°¨à± -Name[tg]=БоÑниÑвӣ -Name[th]=ภาษาบà¸à¸ªà¹€à¸™à¸µà¸¢ -Name[tr]=BoÅŸnakça -Name[tt]=Bosniçä -Name[uk]=БоÑнійÑька -Name[uz]=Bosniyacha -Name[uz@cyrillic]=БоÑниÑча -Name[ven]=Mubosinia -Name[vi]=Bo-x-ni-a -Name[wa]=Bosnyin -Name[zh_CN]=æ³¢æ–¯å°¼äºšè¯ -Name[zh_HK]=波斯尼亞語 -Name[zh_TW]=波士尼亞語 -Name[zu]=Isi-Bosnian [ca] Name=Catalan -Name[af]=Katelaans -Name[ar]=الكاتالونية -Name[az]=Katalanca -Name[be]=КаталонÑÐºÐ°Ñ -Name[bg]=КаталонÑки -Name[bn]=কà§à¦¯à¦¾à¦Ÿà¦¾à¦²à¦¾à¦¨ -Name[br]=Katalaneg -Name[bs]=Katalonski -Name[ca]=Català -Name[cs]=Katalánský -Name[csb]=KataloÅ„sczi -Name[cy]=Catalaneg -Name[da]=Catalansk -Name[de]=Katalanisch -Name[el]=Καταλανικά -Name[eo]=Kataluna -Name[es]=Catalán -Name[et]=Katalaani -Name[eu]=Katalaniera -Name[fa]=کاتالانی -Name[fi]=Katalaani -Name[fy]=Katalaansk -Name[ga]=Catalóinis -Name[gl]=Catalán -Name[he]=×§×˜×œ×•× ×™×ª -Name[hi]=केटालन -Name[hr]=Katalonski -Name[hsb]=Katalansce -Name[hu]=Katalán -Name[is]=Katalánska -Name[it]=Catalano -Name[ja]=ã‚«ã‚¿ãƒãƒ‹ã‚¢èªž -Name[ka]=კáƒáƒ¢áƒáƒšáƒáƒœáƒ£áƒ ი -Name[kk]=Каталанша -Name[km]=កាážáž¶áž¡áž¶áž“ -Name[ko]=카탈로니아어 -Name[lb]=Katalanesch -Name[lt]=Katalonų -Name[lv]=Kataloņu -Name[mi]=Reo Peina Raki Räwhiti -Name[mk]=КаталонÑки -Name[mn]=Каталан -Name[mt]=Katalan -Name[nb]=Katalansk -Name[nds]=Katalaansch -Name[ne]=काटालान -Name[nl]=Catalaans -Name[nn]=Katalansk -Name[nso]=Se-Catalan -Name[pa]=ਕਾਟਾਲਾਨ -Name[pl]=KataloÅ„ski -Name[pt]=Catalão -Name[pt_BR]=Catalão -Name[ro]=Catalană -Name[ru]=КаталонÑкий -Name[rw]=Igikatalani -Name[se]=Katalánagiella -Name[sk]=katalánÄina -Name[sl]=katalonsko -Name[sq]=Katalanisht -Name[sr]=КаталонÑки -Name[sr@Latn]=Katalonski -Name[ss]=Si-Catalan -Name[sv]=Katalanska -Name[ta]=கடலான௠-Name[te]=కెటలనౠ-Name[tg]=Каталанӣ -Name[th]=ภาษาคาตาลาน -Name[tr]=Katalan Dili -Name[tt]=Katalança -Name[uk]=КаталонÑька -Name[uz]=Katalancha -Name[uz@cyrillic]=Каталанча -Name[vi]=Ca-ta-lan -Name[zh_CN]=åŠ æ³°ç½—å°¼äºšè¯ -Name[zh_HK]=嘉泰羅尼亞語 -Name[zh_TW]=嘉泰羅尼亞語 -Name[zu]=Isi-Catalan [ce] Name=Chechen -Name[ar]=شيشاني -Name[az]=ÇexencÉ™ -Name[be]=ЧачÑнÑÐºÐ°Ñ -Name[bg]=ЧеченÑки -Name[bn]=চেচেন -Name[br]=Tchetcheneg -Name[bs]=ÄŒeÄenski -Name[ca]=Txetxè -Name[cs]=ÄŒeÄenský -Name[csb]=CzeczeÅ„sczi -Name[cy]=Checheneg -Name[de]=Tschetschenisch -Name[eo]=Ĉeĉena -Name[es]=Checheno -Name[et]=TÅ¡etÅ¡eeni -Name[fa]=Ú†Ú†Ù†ÛŒ -Name[fi]=TÅ¡etÅ¡eeni -Name[fr]=Tchétchène -Name[fy]=Tsjechysk -Name[ga]=Seisnis -Name[gl]=Checheno -Name[he]=צ'צ'× ×™×ª -Name[hi]=चेचेन -Name[hr]=ÄŒeÄenski -Name[hsb]=ÄŒeÄenisce -Name[hu]=Csecsen -Name[is]=Tékkneska -Name[it]=Ceceno -Name[ja]=ãƒã‚§ãƒã‚§ãƒ³èªž -Name[ka]=ჩეჩნური -Name[kk]=Шешенше -Name[km]=ឆáŸáž€ážˆáž·áž“ -Name[ko]=체첸어 -Name[lb]=Tschetschenesch -Name[lt]=ČėÄÄ—nų -Name[lv]=ÄŒeÄenu -Name[mk]=ЧеченÑки -Name[mn]=Чечен -Name[nb]=Tsjetsjensk -Name[nds]=Tschetscheensch -Name[ne]=चेचेन -Name[nn]=Tsjetsjensk -Name[nso]=Se-Chechen -Name[pa]=ਚੇਚਨ -Name[pl]=CzeczeÅ„ski -Name[pt]=Checheno -Name[pt_BR]=Chechênio -Name[ro]=Cecenă -Name[ru]=ЧеченÑкий -Name[rw]=Igiceceni -Name[se]=ÄŒeÄeniagiella -Name[sk]=ÄeÄenÄina -Name[sl]=ÄeÄensko -Name[sq]=Çeçenisht -Name[sr]=ЧеченÑки -Name[sr@Latn]=ÄŒeÄenski -Name[ss]=Si-Chechen -Name[sv]=Tjetjenska -Name[ta]=செசà¯à®šà¯†à®©à¯ -Name[te]=చెచనౠ-Name[tg]=Чеченӣ -Name[th]=ภาษาเชเชน -Name[tr]=Çeçen -Name[tt]=Çäçänçä -Name[uk]=ЧеченÑька -Name[uz]=Chechencha -Name[uz@cyrillic]=Чеченча -Name[vi]=Che-chen -Name[wa]=Tchetchene -Name[zh_CN]=è½¦è‡£è¯ -Name[zh_HK]=Chechen語 -Name[zh_TW]=Chechen語 -Name[zu]=Isi-Chechen [ch] Name=Chamorro -Name[ar]=شامورو -Name[az]=Xamorroca -Name[be]=ЧаморÑÐºÐ°Ñ -Name[bg]=Чаморо -Name[bn]=চামোরো -Name[bs]=Kamoro -Name[cy]=Chamorreg -Name[eo]=Ĉamora -Name[fa]=کاماروئی -Name[ga]=Seamóróis -Name[he]=צ'מורו -Name[hi]=केमोरो -Name[hr]=ÄŒamorski -Name[is]=Chamorró -Name[ja]=ãƒãƒ£ãƒ¢ãƒèªž -Name[ka]=ჩáƒáƒ›áƒáƒ რ-Name[kk]=Чаморро -Name[km]=ចាមូរូ -Name[mk]=Чаморо -Name[mn]=Чаморро -Name[ne]=कà¥à¤¯à¤¾à¤®à¥‹à¤°à¥‹à¤¨à¥€ -Name[nso]=Se-Chamorro -Name[pa]=ਚਾਮੂਰੂ -Name[ro]=Camoro -Name[ru]=Чаморро -Name[rw]=Igishamoro -Name[se]=Chamorrogiella -Name[sk]=ÄamorÄina -Name[sl]=chamorro -Name[sq]=Kamoroisht -Name[sr]=ЧаморÑки -Name[sr@Latn]=ÄŒamorski -Name[ss]=Si-Chamorro -Name[ta]=சமாரோ -Name[te]=చమొరà±à°°à±Š -Name[tg]=Чаморроӣ -Name[th]=ภาษาชามà¸à¹‚ร -Name[tt]=Çamorroça -Name[uk]=Чаморо -Name[uz@cyrillic]=Чаморро -Name[vi]=Cha-mo-rô -Name[zh_CN]=æŸ¥èŽ«ç½—è¯ -Name[zh_HK]=查摩洛語 -Name[zh_TW]=查摩洛語 -Name[zu]=Isi-Chamorro [co] Name=Corsican -Name[ar]=كورسيكي -Name[az]=Korsikaca -Name[be]=КарÑіканÑÐºÐ°Ñ -Name[bg]=КорÑиканÑки -Name[bn]=করà§à¦¸à¦¿à¦•à¦¾à¦¨ -Name[br]=Korseg -Name[bs]=Korzikanski -Name[ca]=Cors -Name[cs]=Korsický -Name[csb]=KòrsykaÅ„sczi -Name[cy]=Corsiceg -Name[da]=Korsikansk -Name[de]=Korsisch -Name[el]=ΚοÏσικανικά -Name[eo]=Korsika -Name[es]=Corso -Name[et]=Korsika -Name[eu]=Korsiera -Name[fa]=کورسیکانی -Name[fi]=Korsika -Name[fr]=Corse -Name[fy]=Korsikaansk -Name[ga]=Corsaicis -Name[gl]=Corso -Name[he]=×§×•×¨×¡×™×§× ×™×ª -Name[hi]=कॉरà¥à¤¸à¤¿à¤¯à¤¨ -Name[hr]=Korzikanski -Name[hsb]=Korsisce -Name[hu]=Korzikai -Name[is]=KorsÃkanska -Name[it]=Corso -Name[ja]=コルシカ語 -Name[ka]=კáƒáƒ სიკული -Name[kk]=КорÑиканша -Name[km]=កូស៊ីកា -Name[lb]=Korsesch -Name[lt]=KorsikieÄių -Name[lv]=KorsikieÅ¡u -Name[mk]=КорзиканÑки -Name[mn]=КорÑикан -Name[nb]=Korsikansk -Name[nds]=Korssch -Name[ne]=कोरà¥à¤¸à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Corsicaans -Name[nn]=Korsikansk -Name[nso]=Se-Corsican -Name[pa]=ਕà©à¨°à¨¸à©€à¨•à©‡à¨¨ -Name[pl]=KorsykaÅ„ski -Name[pt]=Corso -Name[ro]=Corsicană -Name[ru]=КорÑиканÑкий -Name[rw]=Igikoruse -Name[se]=Korsikagiella -Name[sk]=korziÄtina -Name[sl]=korzijÅ¡ko -Name[sq]=Korsikanisht -Name[sr]=КорзиканÑки -Name[sr@Latn]=Korzikanski -Name[ss]=Si-Corsican -Name[sv]=Korsikanska -Name[ta]=கோரà¯à®šà®¿à®•à®©à¯ -Name[te]=కొరà±à°¸à°¿à°•à°¨à± -Name[tg]=КорÑиканӣ -Name[th]=ภาษาคà¸à¸£à¹Œà¸‹à¸´à¸à¸±à¸™ -Name[tt]=Korsikça -Name[uk]=КорÑиканÑька -Name[uz]=Korsikancha -Name[uz@cyrillic]=КорÑиканча -Name[vi]=Coa-xi-ca -Name[wa]=Corse -Name[zh_CN]=ç§‘è¥¿å˜‰è¯ -Name[zh_HK]=科西嘉語 -Name[zh_TW]=科西嘉語 -Name[zu]=Isi-Corsican [cs] Name=Czech -Name[af]=Tsjeggië -Name[ar]=التشيكية -Name[az]=ÇexcÉ™ -Name[be]=ЧÑшÑÐºÐ°Ñ -Name[bg]=Чешки -Name[bn]=চেক -Name[br]=Tchekeg -Name[bs]=ÄŒeÅ¡ki -Name[ca]=Txec -Name[cs]=ÄŒeský -Name[csb]=Czesczi -Name[cy]=Tsiec -Name[da]=Tjekkisk -Name[de]=Tschechisch -Name[el]=ΤσÎχικα -Name[eo]=ĈeÄ¥a -Name[es]=Checo -Name[et]=TÅ¡ehhi -Name[eu]=Txekiera -Name[fa]=Ú†Ú© -Name[fi]=TÅ¡ekki -Name[fr]=Tchèque -Name[fy]=Tsjechysk -Name[ga]=Seicis -Name[gl]=Checo -Name[he]=צ'כית -Name[hi]=चेक -Name[hr]=ÄŒeÅ¡ki -Name[hsb]=Čěsce -Name[hu]=Cseh -Name[id]=Ceko -Name[is]=Tékkneska -Name[it]=Ceco -Name[ja]=ãƒã‚§ã‚³èªž -Name[ka]=ჩეხური -Name[kk]=Чехше -Name[km]=ឆáŸáž€ -Name[ko]=체코어 -Name[lb]=Tschechesch -Name[lt]=ÄŒekų -Name[lv]=ÄŒehu -Name[mk]=Чешки -Name[mn]=Чех -Name[mt]=ÄŠek -Name[nb]=Tsjekkisk -Name[nds]=Tschechsch -Name[ne]=चेक -Name[nl]=Tsjechisch -Name[nn]=Tsjekkisk -Name[nso]=Se-Czech -Name[oc]=Chec -Name[pa]=ਚੈੱਕ -Name[pl]=Czeski -Name[pt]=Checo -Name[pt_BR]=Tcheco -Name[ro]=Cehă -Name[ru]=ЧешÑкий -Name[rw]=Ikinyaceke -Name[se]=ÄŒehkagiella -Name[sk]=ÄeÅ¡tina -Name[sl]=ÄeÅ¡ko -Name[sq]=Çekisht -Name[sr]=Чешки -Name[sr@Latn]=ÄŒeÅ¡ki -Name[ss]=Si-Czech -Name[sv]=Tjeckiska -Name[ta]=செக௠-Name[te]=చెకౠ-Name[tg]=Чехӣ -Name[th]=เชค -Name[tr]=Çekçe -Name[tt]=Çexçä -Name[uk]=ЧеÑька -Name[uz]=Chexcha -Name[uz@cyrillic]=Чехча -Name[vi]=Séc -Name[wa]=Tcheke -Name[zh_CN]=æ·å…‹è¯ -Name[zh_HK]=æ·å…‹èªž -Name[zh_TW]=æ·å…‹èªž -Name[zu]=Isi-Czech [csb] Name=Kashubian -Name[bg]=КашубÑки -Name[ca]=Caixubi -Name[da]=Kashubiansk -Name[de]=Kaschubisch -Name[es]=Casubio -Name[et]=KaÅ¡uubi -Name[fr]=Kachoube -Name[is]=KashubÃska -Name[it]=Casciubico -Name[ja]=カシューブ語 -Name[km]=ážáž¶áž áž·ážáž„់ -Name[nds]=Kaschuubsch -Name[pl]=Kaszubski -Name[sk]=kaÅ¡ubÄtina -Name[sr]=КашубианÑки -Name[sr@Latn]=КашубианÑки -Name[sv]=Kasjubiska [cu] Name=Church Slavic -Name[az]=KilisÉ™ Slavcası -Name[bg]=ЦърковноÑлавÑнÑки -Name[bn]=চারà§à¦š সà§à¦²à¦¾à¦à¦¿à¦• -Name[br]=Slaveg an iliz -Name[bs]=Crkveno-slavenski -Name[ca]=Eslau eclesià stic -Name[cs]=StaroslovÄ›nský -Name[csb]=Stôrôcerwiowò-sÅ‚owiaÅ„sczi -Name[cy]=Slaveg Eglwysol -Name[da]=Kirkeslavisk -Name[de]=Kirchenslawisch -Name[eo]=Eklezia Slava -Name[es]=Eslavo eclesiástico -Name[et]=Kirikuslaavi -Name[eu]=Church Eslaviera -Name[fa]=یوگوسلاویایی -Name[fi]=Kirkkoslaavi -Name[fr]=Slavon d'égise -Name[fy]=Tsjerk-slavysk -Name[ga]=Slaivis Eaglaise -Name[gl]=Eslávo Eclesiástico -Name[he]=סלבית ×›× ×¡×™×™×ª×™×ª -Name[hi]=चरà¥à¤š सà¥à¤²à¤¾à¤µà¤¿à¤• -Name[hr]=Crkveni pravoslavni -Name[hsb]=CyrtwinosÅ‚owjansce -Name[hu]=Szláv (egyházi) -Name[is]=Kirkju-slavneska -Name[it]=Slavo della Chiesa -Name[ja]=教会スラブ語 -Name[ka]=სáƒáƒ”კლესირსლáƒáƒ•áƒ£áƒ ი -Name[kk]=Шірке ÑлавÑнша -Name[km]=ឆឺច ស្លាវិច -Name[ko]=êµíšŒ 슬ë¼ë¸Œì–´ -Name[lb]=Kiircheslawesch -Name[lt]=BažnytinÄ— slavų -Name[lv]=SlÄvu baznÄ«cas -Name[mk]=ЦрковноÑловенÑки -Name[mn]=Чүрч Ñлавик -Name[nb]=Kirkeslavisk -Name[nds]=Ooltslaawsch -Name[ne]=चरà¥à¤š सà¥à¤²à¤¾à¤à¤¿à¤• -Name[nl]=Kerk Slavisch -Name[nn]=Kyrkjeslavisk -Name[nso]=Se-Church Slavic -Name[pa]=ਚੂਰਚ ਸਲਾਵਿਨ -Name[pl]=Starocerkiewno-sÅ‚owiaÅ„ski -Name[pt]=Igreja Eslava -Name[pt_BR]=Eslavo Clássico -Name[ro]=Slavă bisericească -Name[ru]=Церковно-ÑлавÑнÑкий -Name[rw]=Igisilavika -Name[se]=Slávagiella -Name[sk]=cirkevná slovanÄina -Name[sl]=cerkvena slovanÅ¡Äina -Name[sq]=Slavishte Kisthore -Name[sr]=Црквени правоÑлавни -Name[sr@Latn]=Crkveni pravoslavni -Name[ss]=Si-Church Slavic -Name[sv]=Kyrkoslaviska -Name[ta]=சரà¯à®šà¯ ஸà¯à®²à®¾à®µà®¿à®•à¯ -Name[te]=à°šà°°à±à°šà°¿ à°¸à±à°²à°¾à°µà°¿à°•à± -Name[tg]=СлавÑнии мазҳабӣ -Name[th]=ภาษาเชิร์ชสลาฟ -Name[tt]=Slavça, Çerkäw -Name[uk]=ЦерковноÑлов'ÑнÑька -Name[uz]=Cherkov-slovyancha -Name[uz@cyrillic]=Черков-ÑловÑнча -Name[ven]=Slavic Zwakereke -Name[vi]=Xla-vÆ¡ nhà thÆ¡ -Name[wa]=Eslave d' eglijhe -Name[zh_CN]=宗教斯拉夫è¯(å¤ä»£ä¿„è¯) -Name[zh_HK]=æ•™å ‚æ–¯æ‹‰å¤«èªž -Name[zh_TW]=æ•™å ‚æ–¯æ‹‰å¤«èªž -Name[zu]=Isi-Church Slavic [cv] Name=Chuvash -Name[ar]=شوÙاش -Name[az]=ÇuvaÅŸca -Name[be]=ЧувашÑÐºÐ°Ñ -Name[bg]=Чувашки -Name[bn]=চà§à¦à¦¾à¦¶ -Name[br]=Tchuvasheg -Name[bs]=ÄŒuvaÅ¡ -Name[cs]=ÄŒuvaÅ¡ský -Name[csb]=Czuwasczi -Name[cy]=Chuvasheg -Name[de]=Tschuwaschisch -Name[eo]=ĈuvaÅa -Name[et]=TÅ¡uvaÅ¡i -Name[fa]=چواش -Name[fi]=TÅ¡uvassi -Name[fr]=Tchouvache -Name[ga]=Suvais -Name[he]=צ'ובשית -Name[hi]=चाउवेश -Name[hr]=ÄŒuvaÅ¡ki -Name[hsb]=ÄŒuwaÅ¡isce -Name[hu]=Csuvas -Name[ja]=ãƒãƒ¥ãƒ¯ã‚·ãƒ¥èªž -Name[ka]=ჩუვáƒáƒ¨áƒ£áƒ ი -Name[kk]=Шуашша -Name[km]=ចូវ៉ាស -Name[ko]=추바시어 -Name[lb]=Chuvas -Name[lt]=ÄŒiuvašų -Name[lv]=ÄŒuvaÅ¡u -Name[mk]=Чуваш -Name[mn]=Чуваш -Name[nds]=Tschuwasch -Name[ne]=कà¥à¤¯à¥à¤à¤¾à¤¸à¥€ -Name[nso]=Se-Chuvash -Name[pa]=ਚੂਵਸ਼ -Name[pl]=Czuwaski -Name[ro]=Ciuvaşă -Name[ru]=ЧувашÑкий -Name[rw]=Igicuvashi -Name[se]=Chuvashgiella -Name[sk]=ÄuvaÅ¡tina -Name[sl]=chuvash -Name[sq]=Çuvashisisht -Name[sr]=Чувашки -Name[sr@Latn]=ÄŒuvaÅ¡ki -Name[ss]=Si-Chuvash -Name[sv]=Tjuvasjiska -Name[ta]=சà¯à®µà®¾à®·à¯ -Name[te]=à°šà±à°µà°¾à°·à± -Name[tg]=Чувашӣ -Name[th]=ภาษาชูวาช -Name[tt]=Çuaşça -Name[uk]=ЧуваÑька -Name[uz]=Chuvashcha -Name[uz@cyrillic]=Чувашча -Name[vi]=Chu-va-xợ -Name[wa]=Tchouvache -Name[zh_CN]=æ¥šç“¦ä»€è¯ -Name[zh_HK]=楚瓦士語 -Name[zh_TW]=楚瓦士語 -Name[zu]=Isi-Chuvash [cy] Name=Welsh -Name[af]=Wallies -Name[ar]=الويلزية -Name[az]=UelscÉ™ -Name[be]=УÑльÑÐºÐ°Ñ -Name[bg]=УелÑки -Name[bn]=ওয়েলà§â€Œà¦¶ -Name[br]=Kembraeg -Name[bs]=VelÅ¡ki -Name[ca]=Gal·lès -Name[cs]=WelÅ¡ský -Name[csb]=Walijsczi -Name[cy]=Cymraeg -Name[da]=Walisisk -Name[de]=Walisisch -Name[el]=Ουαλικά -Name[eo]=Valisa -Name[es]=Galés -Name[et]=Uelsi -Name[eu]=Galesa -Name[fa]=ولزی -Name[fi]=Wales -Name[fr]=Gallois -Name[fy]=Welsk -Name[ga]=Breatnais -Name[gl]=Galés -Name[he]=וולשית -Name[hi]=वेलà¥à¤¶ -Name[hr]=VelÅ¡ki -Name[hsb]=Kymrisce -Name[hu]=Velszi -Name[id]=Wales -Name[is]=Velska -Name[it]=Gallese -Name[ja]=ウェールズ語 -Name[ka]=უელსური -Name[kk]=УÑлÑше -Name[km]=វែល -Name[ko]=웨ì¼ìŠ¤ì–´ -Name[lb]=Walisesch -Name[lt]=VelsieÄių -Name[lv]=VelÅ¡u -Name[mk]=Велшки -Name[mn]=Вел -Name[ms]=Wales -Name[mt]=Welx -Name[nb]=Walisisk -Name[nds]=Waliessch -Name[ne]=वेलà¥à¤¸ -Name[nn]=Walisisk -Name[nso]=Se-Welsh -Name[pa]=ਵਾਲਿਸ਼ -Name[pl]=Walijski -Name[pt]=Galês -Name[pt_BR]=Gaulês -Name[ro]=Velşă -Name[ru]=УÑльÑкий -Name[rw]=Ikiwelishi -Name[se]=Walesagiella -Name[sk]=waleÅ¡tina -Name[sl]=valižansko -Name[sq]=Uelsh -Name[sr]=ВелшанÑки -Name[sr@Latn]=VelÅ¡anski -Name[ss]=Si-Welsh -Name[sv]=Walesiska -Name[ta]=வெலà¯à®·à¯ -Name[te]=వెలà±à°·à± -Name[tg]=УÑлÑÓ£ -Name[th]=ภาษาเวลช์ -Name[tt]=Welşçä -Name[uk]=УельÑька -Name[uz]=Uelscha -Name[uz@cyrillic]=УÑлÑча -Name[vi]=Ouen-x -Name[wa]=Walès -Name[zh_CN]=å¨å°”士 -Name[zh_HK]=å¨çˆ¾æ–¯èªž -Name[zh_TW]=å¨çˆ¾æ–¯èªž -Name[zu]=Isi-Welsh [da] Name=Danish -Name[af]=Deens -Name[ar]=الدنماركية -Name[az]=Danimarkaca -Name[be]=Ð”Ð°Ñ†ÐºÐ°Ñ -Name[bg]=ДатÑки -Name[bn]=ডà§à¦¯à¦¾à¦¨à¦¿à¦¶ -Name[br]=Daneg -Name[bs]=Danski -Name[ca]=Danès -Name[cs]=Dánský -Name[csb]=Dëńsczi -Name[cy]=Daneg -Name[da]=Dansk -Name[de]=Dänisch -Name[el]=ΔανÎζικα -Name[eo]=Dana -Name[es]=Danés -Name[et]=Taani -Name[eu]=Daniera -Name[fa]=دانمارکی -Name[fi]=Tanska -Name[fr]=Danois -Name[fy]=Deensk -Name[ga]=Danmhairgis -Name[gl]=Dinamarqués -Name[he]=×“× ×™×ª -Name[hi]=दानिश -Name[hr]=Danski -Name[hsb]=Dansce -Name[hu]=Dán -Name[id]=Denmark -Name[is]=Danska -Name[it]=Danese -Name[ja]=デンマーク語 -Name[ka]=დáƒáƒœáƒ˜áƒ£áƒ ი -Name[kk]=Датша -Name[km]=ដាណឺម៉ាក -Name[ko]=ë´ë§ˆí¬ì–´ -Name[lb]=Dänesch -Name[lt]=Danų -Name[lv]=DÄņu -Name[mi]=Reo Tenemaka -Name[mk]=ДанÑки -Name[mn]=Дани -Name[mt]=Daniż -Name[nb]=Dansk -Name[nds]=Däänsch -Name[ne]=डेनिश -Name[nl]=Deens -Name[nn]=Dansk -Name[nso]=Se-Danish -Name[oc]=Danès -Name[pa]=ਡੈਨਿਸ਼ -Name[pl]=DuÅ„ski -Name[pt]=Dinamarquês -Name[pt_BR]=Dinamarquês -Name[ro]=Daneză -Name[ru]=ДатÑкий -Name[rw]=Ikidanwa -Name[se]=Dánskkagiella -Name[sk]=dánÄina -Name[sl]=dansko -Name[sq]=Danisht -Name[sr]=ДанÑки -Name[sr@Latn]=Danski -Name[ss]=Si-Danish -Name[sv]=Danska -Name[ta]=டேனிஷ௠-Name[te]=డెనిషౠ-Name[tg]=ДаниÑвӣ -Name[th]=ภาษาเดนมาร์ค -Name[tr]=Danimarka Dili -Name[tt]=Dança -Name[uk]=ДанÑька -Name[uz]=Daniyacha -Name[uz@cyrillic]=ДаниÑча -Name[vi]=Äan-mạch -Name[wa]=Daenwès -Name[zh_CN]=ä¸¹éº¦è¯ -Name[zh_HK]=丹麥語 -Name[zh_TW]=丹麥語 -Name[zu]=Isi-Danishi [de] Name=German -Name[af]=Duits -Name[ar]=الألمانية -Name[az]=Almanca -Name[be]=ÐÑÐ¼ÐµÑ†ÐºÐ°Ñ -Name[bg]=ÐемÑки -Name[bn]=জারà§à¦®à¦¾à¦¨ -Name[br]=Alamaneg -Name[bs]=NjemaÄki -Name[ca]=Alemany -Name[cs]=NÄ›mecký -Name[csb]=Miemiecczi -Name[cy]=Almaeneg -Name[da]=Tysk -Name[de]=Deutsch -Name[el]=ΓεÏμανικά -Name[eo]=Germana -Name[es]=Alemán -Name[et]=Saksa -Name[eu]=Alemaniera -Name[fa]=آلمانی -Name[fi]=Saksa -Name[fr]=Allemand -Name[fy]=Dútsk -Name[ga]=Gearmáinis -Name[gl]=Alemán -Name[he]=×’×¨×ž× ×™×ª -Name[hi]=जरà¥à¤®à¤¨ -Name[hr]=NjemaÄki -Name[hsb]=NÄ›msce -Name[hu]=Német -Name[id]=Jerman -Name[is]=Þýska -Name[it]=Tedesco -Name[ja]=ドイツ語 -Name[ka]=გერმáƒáƒœáƒ£áƒšáƒ˜ -Name[kk]=ÐеміÑше -Name[km]=អាល្លឺម៉ង់ -Name[ko]=ë…ì¼ì–´ -Name[lb]=Däitsch -Name[lt]=VokieÄių -Name[lv]=VÄcu -Name[mi]=Reo Tiamana -Name[mk]=ГерманÑки -Name[mn]=Герман -Name[ms]=Jerman -Name[mt]=Ä ermaniż -Name[nb]=Tysk -Name[nds]=Hoochdüütsch -Name[ne]=जरà¥à¤®à¤¨à¥€ -Name[nl]=Duits -Name[nn]=Tysk -Name[nso]=Se-German -Name[oc]=Alemani -Name[pa]=ਜਰਮਨ -Name[pl]=Niemiecki -Name[pt]=Alemão -Name[pt_BR]=Alemão -Name[ro]=Germană -Name[ru]=Ðемецкий -Name[rw]=Ikidage -Name[se]=Duiskkagiella -Name[sk]=nemÄina -Name[sl]=nemÅ¡ko -Name[sq]=Gjermanisht -Name[sr]=Ðемачки -Name[sr@Latn]=NemaÄki -Name[ss]=SiJalimani -Name[sv]=Tyska -Name[ta]=ஜெரà¯à®®à®©à¯ -Name[te]=జెరà±à°®à°¨à± -Name[tg]=Олмонӣ -Name[th]=ภาษาเยà¸à¸£à¸¡à¸±à¸™ -Name[tr]=Almanca -Name[tt]=Almança -Name[uk]=Ðімецька -Name[uz]=Nemischa -Name[uz@cyrillic]=ÐемиÑча -Name[ven]=Mudzhemeni -Name[vi]=Äức -Name[wa]=Almand -Name[xh]=Isijamani -Name[zh_CN]=å¾·è¯ -Name[zh_HK]=德語 -Name[zh_TW]=德語 -Name[zu]=Isi-Jalimani [dz] Name=Dzongkha -Name[ar]=الجونغا -Name[az]=Dzunqxaca -Name[be]=Цонга -Name[bg]=Джонкгха -Name[bn]=জঙখা -Name[cy]=Dzongkhaeg -Name[fa]=زونگخا -Name[gl]=Dzongca -Name[he]=×’'×•× ×§×” -Name[hi]=à¤à¥‹à¤‚खा -Name[ja]=ゾンカ語 -Name[ka]=ჯáƒáƒœáƒ™áƒ (ბუტáƒáƒœáƒ˜) -Name[kk]=(Дзонгха) Бутанша -Name[km]=ដុងហ្កា -Name[ko]=부탄어 -Name[mk]=Ðонгха -Name[mn]=Жонгха -Name[ne]=जोङà¥à¤–ा -Name[nso]=Se-Dzongkha -Name[pa]=ਡਜ਼ੋਨਗਖਾ -Name[ru]=Дзонгка (Бутан) -Name[rw]=Ikinyazongika -Name[se]=Dzongkhagiella -Name[sk]=dzongkä -Name[sl]=dzonkha -Name[sq]=Xonganisht -Name[sr]=Ðонка -Name[sr@Latn]=Džonka -Name[ss]=Si-Dzongkha -Name[ta]=டà¯à®šà¯Šà®™à¯à®•à¯à®¹à®¾ -Name[te]=జొంగà±à°– -Name[tg]=Дзонгка (Бутан) -Name[th]=ภาษาซà¸à¸‡à¸„า -Name[tt]=Dzongxaça -Name[uk]=Дзонгка -Name[uz]=Dzongxa -Name[uz@cyrillic]=Дзонгха -Name[vi]=Ä-xong-kha -Name[wa]=Boutanès -Name[zh_CN]=ä¸ä¸¹å®—å¡è¯ -Name[zh_HK]=Dzongkha語 -Name[zh_TW]=Dzongkha語 -Name[zu]=Isi-Dzongkha [el] Name=Greek -Name[af]=Grieks -Name[ar]=اليونانية -Name[az]=Yunanca -Name[be]=ГрÑÑ†ÐºÐ°Ñ -Name[bg]=Гръцки -Name[bn]=গà§à¦°à§€à¦• -Name[br]=Gresianeg -Name[bs]=GrÄki -Name[ca]=Grec -Name[cs]=Řecký -Name[csb]=Grecczi -Name[cy]=Groeg -Name[da]=Græsk -Name[de]=Griechisch -Name[el]=Ελληνικά -Name[eo]=Greka -Name[es]=Griego -Name[et]=Kreeka -Name[eu]=Grekoa -Name[fa]=یونانی -Name[fi]=Kreikka -Name[fr]=Grec -Name[fy]=Gryks -Name[ga]=Gréigis -Name[gl]=Grego -Name[he]=×™×•×•× ×™×ª -Name[hi]=यूनानी -Name[hr]=GrÄki -Name[hsb]=Grjeksce -Name[hu]=Görög -Name[id]=Yunani -Name[is]=GrÃska -Name[it]=Greco -Name[ja]=ギリシャ語 -Name[ka]=ბერძნული -Name[kk]=Грекше -Name[km]=ក្រិក -Name[ko]=그리스어 -Name[lb]=Griichesch -Name[lt]=Graikų -Name[lv]=GrieÄ·u -Name[mi]=Reo Kariki -Name[mk]=Грчки -Name[mn]=Грек -Name[mt]=Grieg -Name[nb]=Gresk -Name[nds]=Greeksch -Name[ne]=गà¥à¤°à¥€à¤• -Name[nl]=Grieks -Name[nn]=Gresk -Name[nso]=Se-Greek -Name[oc]=Grec -Name[pa]=ਗਰੀਕ -Name[pl]=Grecki -Name[pt]=Grego -Name[pt_BR]=Grego -Name[ro]=Greacă -Name[ru]=ГречеÑкий -Name[rw]=Ikigereki -Name[se]=Greikkagiella -Name[sk]=gréÄtina -Name[sl]=grÅ¡ko -Name[sq]=Greqisht -Name[sr]=Грчки -Name[sr@Latn]=GrÄki -Name[ss]=SiGriki -Name[sv]=Grekiska -Name[ta]=கிரேகà¯à®•à®®à¯ -Name[te]=à°—à±à°°à±€à°•à± -Name[tg]=Юнонӣ -Name[th]=ภาษาà¸à¸£à¸µà¸ -Name[tr]=Yunanca -Name[tt]=Yunança -Name[uk]=Грецька -Name[uz]=Yunoncha -Name[uz@cyrillic]=Юнонча -Name[ven]=Mugerika -Name[vi]=Hy-lạp -Name[wa]=Grek -Name[xh]=isigrike -Name[zh_CN]=å¸Œè…Šè¯ -Name[zh_HK]=希臘語 -Name[zh_TW]=希臘語 -Name[zu]=Isi-Grike [en] Name=English -Name[af]=Engels -Name[ar]=الإنجليزية -Name[az]=Ä°ngliscÉ™ -Name[be]=ÐнглійÑÐºÐ°Ñ -Name[bg]=ÐнглийÑки -Name[bn]=ইংরেজ -Name[br]=Saozneg -Name[bs]=Engleski -Name[ca]=Anglès -Name[cs]=Anglický -Name[csb]=Anielsczi -Name[cy]=Saesneg -Name[da]=Engelsk -Name[de]=Englisch -Name[el]=Αγγλικά -Name[eo]=Angla -Name[es]=Inglés -Name[et]=Inglise -Name[eu]=Ingelesa -Name[fa]=انگلیسی -Name[fi]=Englanti -Name[fr]=Anglais -Name[fy]=Ingelsk -Name[ga]=Béarla -Name[gl]=Inglés -Name[he]=×× ×’×œ×™×ª -Name[hi]=अंगà¥à¤°à¥‡à¤œà¤¼à¥€ -Name[hr]=Engleski -Name[hsb]=Jendźelsce -Name[hu]=Angol -Name[id]=Inggris -Name[is]=Enska -Name[it]=Inglese -Name[ja]=英語 -Name[ka]=ინგლისური -Name[kk]=Ðғылшынша -Name[km]=អង់គ្លáŸážŸ -Name[ko]=ì˜ì–´ -Name[lb]=Englesch -Name[lt]=Anglų -Name[lv]=Angļu -Name[mi]=Reo Päkehä -Name[mk]=ÐнглиÑки -Name[mn]=Ðнгли -Name[ms]=Inggeris -Name[mt]=Ingliż -Name[nb]=Engelsk -Name[nds]=Engelsch -Name[ne]=अङà¥à¤—à¥à¤°à¥‡à¤œà¥€ -Name[nl]=Engels -Name[nn]=Engelsk -Name[nso]=Sekgowa -Name[oc]=Anglès -Name[pa]=ਅੰਗਰੇਜ਼ੀ -Name[pl]=Angielski -Name[pt]=Inglês -Name[pt_BR]=Inglês -Name[ro]=Engleză -Name[ru]=ÐнглийÑкий -Name[rw]=Icyongereza -Name[se]=EÅ‹gelasgiella -Name[sk]=angliÄtina -Name[sl]=angleÅ¡ko -Name[sq]=Anglisht -Name[sr]=ЕнглеÑки -Name[sr@Latn]=Engleski -Name[ss]=SiNgisi -Name[sv]=Engelska -Name[ta]=ஆஙà¯à®•à®¿à®²à®®à¯ -Name[te]=ఆంగà±à°²à°‚ -Name[tg]=ÐнглиÑÓ£ -Name[th]=ภาษาà¸à¸±à¸‡à¸à¸¤à¸© -Name[tr]=Ä°ngilizce -Name[tt]=Ä°nglizçä -Name[uk]=ÐнглійÑька -Name[uz]=Inglizcha -Name[uz@cyrillic]=Инглизча -Name[ven]=Luisimane -Name[vi]=Anh -Name[wa]=Inglès -Name[xh]=Isingesi -Name[zh_CN]=è‹±è¯ -Name[zh_HK]=英語 -Name[zh_TW]=英語 -Name[zu]=Isi-Ngisi [en_GB] -Name=British English -Name[af]=Britse Engels -Name[be]=ÐнглійÑÐºÐ°Ñ Ð±Ñ€Ñ‹Ñ‚Ð°Ð½ÑÐºÐ°Ñ -Name[bg]=БританÑки английÑки -Name[bn]=বৃটিশ ইংরেজি -Name[br]=Saozneg eus Bro Saoz -Name[bs]=Britanski engleski -Name[ca]=Anglès brità nic -Name[cs]=Britská angliÄtina -Name[csb]=Britijsczi anielsczi -Name[cy]=Saesneg Prydain -Name[da]=Britisk engelsk -Name[de]=Englisch (UK) -Name[el]=Αγγλικά (Îœ. Î’Ïετανίας) -Name[eo]=Brita Angla -Name[es]=Inglés británico -Name[et]=Briti inglise -Name[eu]=Ingelesa (britainiarra) -Name[fa]=انگلیسی بریتانیایی -Name[fi]=Brittienglanti -Name[fr]=Anglais britannique -Name[fy]=Britsk Ingelsk -Name[ga]=Béarla na Sasanach -Name[gl]=Inglés de GB -Name[he]=×× ×’×œ×™×ª בריטית -Name[hr]=Britanski Engleski -Name[hsb]=Jendźelsce (WB) -Name[hu]=Angol (brit) -Name[id]=Inggris Inggris -Name[is]=Bresk enska -Name[it]=Inglese britannico -Name[ja]=イギリス英語 -Name[ka]=ინგლისური (დიდი ბრიტáƒáƒœáƒ”თი) -Name[kk]=Британдық ағылшынша -Name[km]=អង់គ្លáŸážŸ (អង់គ្លáŸážŸ) -Name[lb]=Britescht Englesch -Name[lt]=Anglų (D.Britanijos) -Name[lv]=Britu angļu -Name[mk]=ÐнглиÑки (британÑки) -Name[nb]=Britisk engelsk -Name[nds]=Britsch Engelsch -Name[ne]=बेलायती अङà¥à¤—à¥à¤°à¥‡à¤œà¥€ -Name[nl]=Engels (Brits) -Name[nn]=Engelsk (Storbritannia) -Name[pa]=ਅੰਗਰੇਜ਼ੀ ਬਰਤਾਨੀਆ -Name[pl]=Angielski brytyjski -Name[pt]=Inglês da Grã-Bretanha -Name[pt_BR]=Inglês Britânico -Name[ro]=Engleză britanică -Name[ru]=ÐнглийÑкий (ВеликобританиÑ) -Name[rw]=Icyongereza, Nyongereza -Name[se]=EÅ‹gelasgiella (Stuorra Brittania) -Name[sk]=angliÄtina (Spojené kráľovstvo) -Name[sl]=britansko angleÅ¡ko -Name[sr]=БританÑки енглеÑки -Name[sr@Latn]=Britanski engleski -Name[sv]=Brittisk engelska -Name[ta]=பிரிடà¯à®Ÿà®¿à®·à¯ ஆஙà¯à®•à®¿à®²à®®à¯ -Name[te]=à°¬à±à°°à°¿à°Ÿà°¿à°·à± ఆంగà±à°²à°‚ -Name[tg]=ÐнглиÑÓ£(Британӣ) -Name[th]=ภาษาà¸à¸±à¸‡à¸à¸¤à¸© บริติช -Name[tr]=Ä°ngiliz Ä°ngilizcesi -Name[tt]=Ä°nglizçä (Britania) -Name[uk]=ÐнглійÑька (ВеликобританіÑ) -Name[uz]=Inglizcha (Angliya) -Name[uz@cyrillic]=Инглизча (ÐнглиÑ) -Name[vi]=Anh (quốc Anh) -Name[wa]=Inglès britanike -Name[zh_CN]=è‹±å›½è‹±è¯ -Name[zh_HK]=英å¼è‹±èªž -Name[zh_TW]=（英å¼ï¼‰è‹±èªž +Name=English (British) [en_US] -Name=American English -Name[af]=Amerikaanse Engels -Name[be]=ÐнглійÑÐºÐ°Ñ Ð°Ð¼ÐµÑ€Ñ‹ÐºÐ°Ð½ÑÐºÐ°Ñ -Name[bg]=ÐмериканÑки английÑки -Name[bn]=মারà§à¦•à¦¿à¦¨ ইংরেজি -Name[br]=Saozneg eus SUA -Name[bs]=AmeriÄki engleski -Name[ca]=Anglès americà -Name[cs]=Americká angliÄtina -Name[csb]=AmerikaÅ„sczi anielsczi -Name[da]=Amerikansk engelsk -Name[de]=Englisch (US) -Name[el]=Αγγλικά (ΑμεÏικής) -Name[eo]=Usona Angla -Name[es]=Inglés americano -Name[et]=Ameerika inglise -Name[eu]=Ingelesa (amerikarra) -Name[fa]=انگلیسی امریکایی -Name[fi]=Amerikanenglanti -Name[fr]=Anglais américain -Name[fy]=Amerikaansk Ingelsk -Name[ga]=Béarla Mheiriceá -Name[gl]=Inglés Americano -Name[he]=×× ×’×œ×™×ª ×מרק×ית -Name[hr]=AmeriÄki Engleski -Name[hsb]=Jendźelsce (USA) -Name[hu]=Angol (amerikai) -Name[id]=Inggris Amerika -Name[is]=BandarÃsk enska -Name[it]=Inglese americano -Name[ja]=アメリカ英語 -Name[ka]=ინგლისური (áƒáƒ¨áƒ¨) -Name[kk]=Ðмерикандық ағылшынша -Name[km]=អង់គ្លáŸážŸ អាមáŸážšáž·áž€ -Name[lb]=Amerikanescht Englesch -Name[lt]=Anglų (JAV) -Name[lv]=AmerikÄņu angļu -Name[mk]=ÐнглиÑки (американÑки) -Name[nb]=Amerikansk engelsk -Name[nds]=Amerikaansch Engelsch -Name[ne]=अमेरेकी अङà¥à¤—à¥à¤°à¥‡à¤œà¥€ -Name[nl]=Engels (Amerikaans) -Name[nn]=Engelsk (USA) -Name[pa]=ਅੰਗਰੇਜ਼ੀ ਅਮਰੀਕੀ -Name[pl]=Angielski amerykaÅ„ski -Name[pt]=Inglês Americano -Name[pt_BR]=Inglês Americano -Name[ro]=Engleză americană -Name[ru]=ÐнглийÑкий (СШÐ) -Name[rw]=Icyongereza cy'Amerika -Name[se]=EÅ‹gelasgiella (AmerihkáhlaÅ¡) -Name[sk]=angliÄtina (USA) -Name[sl]=ameriÅ¡ko angleÅ¡ko -Name[sr]=Ðмерички енглеÑки -Name[sr@Latn]=AmeriÄki engleski -Name[sv]=Amerikansk engelska -Name[ta]=அமெரிகà¯à®•à®©à¯ ஆஙà¯à®•à®¿à®²à®®à¯ -Name[te]=అమెరికనౠఆంగà±à°²à°‚ -Name[tg]=ÐнглиÑÓ£(Ðмрикоӣ) -Name[th]=ภาษาà¸à¸±à¸‡à¸à¸¤à¸© à¸à¹€à¸¡à¸£à¸´à¸à¸±à¸™ -Name[tr]=Amerikan Ä°ngilizcesi -Name[tt]=Ä°nglizçä (Amerika) -Name[uk]=ÐнглійÑька (СШÐ) -Name[uz]=Inglizcha (AQSH) -Name[uz@cyrillic]=Инглизча (ÐҚШ) -Name[vi]=Anh (Mỹ) -Name[zh_CN]=ç¾Žå›½è‹±è¯ -Name[zh_HK]=美å¼è‹±èªž -Name[zh_TW]=美語 +Name=English (American) [eo] Name=Esperanto -Name[ar]=الإسبرانتو -Name[az]=Esperantoca -Name[be]=ÐÑперанта -Name[bg]=ЕÑперанто -Name[bn]=à¦à¦¸à§à¦ªà¦¾à¦°à¦¾à¦¨à§à¦¤à§‹ -Name[br]=Esperanteg -Name[eu]=Esperantoa -Name[fa]=اسپرانتور -Name[fr]=Espéranto -Name[he]=××¡×¤×¨× ×˜×• -Name[hi]=à¤à¤¸à¥à¤ªà¤°à¥‡à¤‚तो -Name[hu]=Eszperantó -Name[ja]=エスペラント語 -Name[ka]=ესპერáƒáƒœáƒ¢áƒ -Name[kk]=ÐÑперанто -Name[km]=អáŸážŸáŸ’áž–áŸážšáŸ‰áž¶áž“់ážáž¼ -Name[ko]=ì—ìŠ¤íŽ˜ëž€í† -Name[mk]=ЕÑперанто -Name[mn]=ÐÑпиранто -Name[ne]=इसà¥à¤ªà¥‡à¤°à¤¾à¤¨à¥à¤¤à¥‹ -Name[nso]=Se-Esperanto -Name[oc]=Esperantò -Name[pa]=ਇਸਪੀਰਨਟੋ -Name[ru]=ÐÑперанто -Name[rw]=Icyesiperanto -Name[sk]=esperanto -Name[sl]=esperanto -Name[sr]=ЕÑперанто -Name[ss]=Si-Esperanto -Name[ta]=எஸà¯à®ªà®°à®¾à®©à¯à®Ÿà¯‹ -Name[te]=à°Žà°¸à±à°ªà°°à°¾à°¨à±à°Ÿà±Š -Name[tg]=ÐÑперантоӣ -Name[th]=ภาษาเà¸à¸ªà¹€à¸›à¸à¸£à¹Œà¸£à¸±à¸™à¹‚ต -Name[tt]=Esperantoça -Name[uk]=ЕÑперанто -Name[uz@cyrillic]=ÐÑперанто -Name[vi]=Ét-pe-ran-tô -Name[zh_CN]=ä¸–ç•Œè¯ -Name[zh_HK]=世界語 -Name[zh_TW]=世界語 -Name[zu]=Isi-Esperanto [es] Name=Spanish -Name[af]=Spaans -Name[ar]=الأسبانية -Name[az]=Ä°spanca -Name[be]=ІÑпанÑÐºÐ°Ñ -Name[bg]=ИÑпанÑки -Name[bn]=সà§à¦ªà§à¦¯à¦¾à¦¨à¦¿à¦¶ -Name[br]=Spagnoleg -Name[bs]=Å panski -Name[ca]=Espanyol -Name[cs]=Å panÄ›lský -Name[csb]=SzpaÅ„sczi -Name[cy]=Sbaeneg -Name[da]=Spansk -Name[de]=Spanisch -Name[el]=Ισπανικά -Name[eo]=Hispana -Name[es]=Español -Name[et]=Hispaania -Name[eu]=Gaztelera -Name[fa]=اسپانیایی -Name[fi]=Espanja -Name[fr]=Espagnol -Name[fy]=Spaansk -Name[ga]=Spáinnis -Name[gl]=Castellano -Name[he]=ספרדית -Name[hi]=सà¥à¤ªà¥‡à¤¨à¥€ -Name[hr]=Å panjolski -Name[hsb]=Å panisce -Name[hu]=Spanyol -Name[id]=Spanyol -Name[is]=Spánska -Name[it]=Spagnolo -Name[ja]=スペイン語 -Name[ka]=ესპáƒáƒœáƒ£áƒ ი -Name[kk]=ИÑпанша -Name[km]=អáŸážŸáŸ’ប៉ាញ -Name[ko]=스페ì¸ì–´ -Name[lb]=Spuenesch -Name[lt]=Ispanų -Name[lv]=SpÄņu -Name[mi]=Reo Peina -Name[mk]=ШпанÑки -Name[mn]=ИÑпани -Name[ms]=Sepanyol -Name[mt]=Spanjol -Name[nb]=Spansk -Name[nds]=Spaansch -Name[ne]=सà¥à¤ªà¥‡à¤¨à¤¿à¤¶ -Name[nl]=Spaans -Name[nn]=Spansk -Name[nso]=Se-Spanish -Name[oc]=Espanhòl -Name[pa]=ਸਪੇਨੀ -Name[pl]=HiszpaÅ„ski -Name[pt]=Espanhol -Name[pt_BR]=Espanhol -Name[ro]=Spaniolă -Name[ru]=ИÑпанÑкий -Name[rw]=Igisipanyole -Name[se]=Spánskkagiella -Name[sk]=Å¡panielÄina -Name[sl]=Å¡pansko -Name[sq]=Spanjollisht -Name[sr]=ШпанÑки -Name[sr@Latn]=Å panski -Name[ss]=SiSpanishi -Name[sv]=Spanska -Name[ta]=ஸà¯à®ªà®¾à®©à®¿à®¯ -Name[te]=à°¸à±à°ªà±†à°¨à°¿à°·à± -Name[tg]=ИÑпанӣ -Name[th]=ภาษาสเปน -Name[tr]=Ä°spanyolca -Name[tt]=Ä°spança -Name[uk]=ІÑпанÑька -Name[uz]=Ispancha -Name[uz@cyrillic]=ИÑпанча -Name[vi]=Tây-ban-nha -Name[wa]=Castiyan -Name[xh]=Isipanishi -Name[zh_CN]=西çç‰™è¯ -Name[zh_HK]=西ç牙語 -Name[zh_TW]=西ç牙語 -Name[zu]=Isi-Penishi +[es_AR] +Name=Spanish (Argentina) [et] Name=Estonian -Name[af]=Estonianse -Name[ar]=الإستونية -Name[az]=Estonca -Name[be]=ÐÑтонÑÐºÐ°Ñ -Name[bg]=ЕÑтонÑки -Name[bn]=à¦à¦¸à§à¦Ÿà§‹à¦¨à§€à§Ÿ -Name[br]=Estoneg -Name[bs]=Estonski -Name[ca]=Estonià -Name[cs]=Estonský -Name[csb]=EstoÅ„sczi -Name[cy]=Estoneg -Name[da]=Estisk -Name[de]=Estnisch -Name[el]=Εσθονικά -Name[eo]=Estlanda -Name[es]=Estonio -Name[et]=Eesti -Name[eu]=Estoniera -Name[fa]=استونیایی -Name[fi]=Eesti -Name[fr]=Estonien -Name[fy]=Estsk -Name[ga]=Eastóinis -Name[gl]=Estoniano -Name[he]=××¡×˜×•× ×™×ª -Name[hi]=à¤à¤¸à¥à¤¤à¥‹à¤¨à¤¿à¤¯à¤¨ -Name[hr]=Estonski -Name[hsb]=Estnisce -Name[hu]=Észt -Name[id]=Estonia -Name[is]=Eistneska -Name[it]=Estone -Name[ja]=エストニア語 -Name[ka]=ესტáƒáƒœáƒ£áƒ ი -Name[kk]=ÐÑтонша -Name[km]=អáŸážŸáŸ’ážáž¼áž“ី -Name[ko]=ì—ìŠ¤í† ë‹ˆì•„ì–´ -Name[lb]=Estnesch -Name[lt]=Estų -Name[lv]=Igauņu -Name[mi]=Reo Etonia -Name[mk]=ЕÑтонÑки -Name[mn]=ÐÑтони -Name[ms]=Estonia -Name[mt]=Estonjan -Name[nb]=Estisk -Name[nds]=Estnsch -Name[ne]=इसà¥à¤Ÿà¥‹à¤¨à¤¿à¤¯à¤¨ -Name[nl]=Ests -Name[nn]=Estisk -Name[nso]=Se-Estonian -Name[pa]=ਇਸਟੋਨੀਆ -Name[pl]=EstoÅ„ski -Name[pt]=Estónio -Name[pt_BR]=Estoniano -Name[ro]=Estoniană -Name[ru]=ÐÑтонÑкий -Name[rw]=Icyesitoniya -Name[se]=Esttegiella -Name[sk]=estónÄina -Name[sl]=estonsko -Name[sq]=Estonisht -Name[sr]=ЕÑтонÑки -Name[sr@Latn]=Estonski -Name[ss]=Si-Estonian -Name[sv]=Estniska -Name[ta]=எஸà¯à®Ÿà¯‹à®©à®¿à®¯à®©à¯ -Name[te]=à°Žà°¸à±à°Ÿà±Šà°¨à°¿à°¯à°¨à± -Name[tg]=ÐÑтонӣ -Name[th]=ภาษาเà¸à¸ªà¹‚ทเนีย -Name[tr]=Estonca -Name[tt]=Estonça -Name[uk]=ЕÑтонÑька -Name[uz]=Estoncha -Name[uz@cyrillic]=ÐÑтонча -Name[vi]=E-x-tô-ni-a -Name[wa]=Estonyin -Name[zh_CN]=çˆ±æ²™å°¼äºšè¯ -Name[zh_HK]=愛沙尼亞語 -Name[zh_TW]=愛沙尼亞語 -Name[zu]=Isi-Estonian [eu] Name=Basque -Name[ar]=الباسك -Name[az]=Baskca -Name[be]=БаÑÑ†ÐºÐ°Ñ -Name[bg]=БаÑкийÑки -Name[bn]=বাসà§à¦• -Name[br]=Euskareg -Name[bs]=Baskijski -Name[ca]=Basc -Name[cs]=Baskický -Name[csb]=Baskijsczi -Name[cy]=Basgeg -Name[da]=Baskisk -Name[de]=Baskisch -Name[el]=Βασκικά -Name[eo]=Vaska -Name[es]=Vasco -Name[et]=Baski -Name[eu]=Euskara -Name[fa]=باسکی -Name[fi]=Baski -Name[fy]=Baskysk -Name[ga]=Bascais -Name[gl]=Basco -Name[he]=בסקית -Name[hi]=बाशà¥à¤• -Name[hr]=Baskijski -Name[hsb]=Baskisce -Name[hu]=Baszk -Name[is]=Baskamál -Name[it]=Basco -Name[ja]=ãƒã‚¹ã‚¯èªž -Name[ka]=ბáƒáƒ¡áƒ™áƒ£áƒ ი -Name[kk]=БаÑкша -Name[km]=បាស្ក០-Name[ko]=바스í¬ì–´ -Name[lb]=Baskesch -Name[lt]=Baskų -Name[lv]=Basku -Name[mk]=БаÑкиÑки -Name[mn]=БаÑкү -Name[mt]=Bask -Name[nb]=Baskisk -Name[nds]=Basksch -Name[ne]=बासà¥à¤• -Name[nl]=Baskisch -Name[nn]=Baskisk -Name[nso]=Se-Basque -Name[oc]=Bascon -Name[pa]=ਬਸਕਿਉ -Name[pl]=Baskijski -Name[pt]=Basco -Name[pt_BR]=Basco -Name[ro]=Bască -Name[ru]=БаÑкÑкий -Name[rw]=Ikibasike -Name[se]=BaskalaÅ¡giella -Name[sk]=baskiÄtina -Name[sl]=baskovsko -Name[sq]=Baskisht -Name[sr]=БаÑкијÑки -Name[sr@Latn]=Baskijski -Name[ss]=Si-Basque -Name[sv]=Baskiska -Name[ta]=பாஸà¯à®•à¯ -Name[te]=బాసà±à°•à± -Name[tg]=БаÑкӣ -Name[th]=ภาษาบาสà¸à¹Œ -Name[tr]=Bask Dili -Name[tt]=Basqça -Name[uk]=БаÑкÑька -Name[uz]=Baskcha -Name[uz@cyrillic]=БаÑкча -Name[vi]=Ba-x-quợ -Name[wa]=Basse -Name[zh_CN]=å·´æ–¯å…‹è¯ -Name[zh_HK]=巴斯克語 -Name[zh_TW]=巴斯克語 -Name[zu]=Isi-Basque [fa] -Name=Farsi (Persian) -Name[af]=Farsi (Persies) -Name[ar]=Ùارسي -Name[be]=ПерÑідÑÐºÐ°Ñ -Name[bg]=ФарÑи -Name[bn]=ফারà§à¦¸à¦¿ (পারà§à¦¸à¦¿à§Ÿà¦¾à¦¨) -Name[br]=Farsieg (Persieg) -Name[bs]=Farsi (Perzijski) -Name[ca]=Farsi (Persa) -Name[cs]=Farsi (Perský) -Name[csb]=Farsi (persczi) -Name[cy]=Farsi (Perseg) -Name[da]=Farsi (Persisk) -Name[de]=Farsi (Persisch) -Name[el]=Farsi (ΠεÏσικά) -Name[eo]=Frisa (Persa) -Name[es]=Persa -Name[et]=Farsi (pärsia) -Name[eu]=Farsiera (Persiera) -Name[fa]=Ùارسی -Name[fi]=Farsi (Persia) -Name[fr]=Persan -Name[fy]=Farsysk (Persysk) -Name[ga]=Fairsis (Peirsis) -Name[gl]=Frisón (Pársi) -Name[he]=פרסית -Name[hi]=फ़ारसी (परà¥à¤¸à¤¿à¤¯à¤¨) -Name[hr]=Farsi (Perzijski) -Name[hsb]=Farsi (Persisce) -Name[hu]=Fárszi (perzsa) -Name[id]=Persia -Name[is]=Farsi (Persneska) -Name[it]=Farsi (Persiano) -Name[ja]=ペルシア語 -Name[ka]=სპáƒáƒ სული (ფáƒáƒ სი) -Name[kk]=ФарÑи -Name[km]=ហ្វាស៊ី (ពឺស៊ាន) -Name[ko]=팔시 (페르시아어) -Name[lb]=Farsi (Persesch) -Name[lt]=Farsi (persų) -Name[lv]=PersieÅ¡u (Farsi) -Name[mk]=ФарÑи (перÑиÑки) -Name[mn]=ФарÑи (ПерÑ) -Name[ms]=Parsi -Name[nb]=Farsi (Persisk) -Name[nds]=Farsi (Persisch) -Name[ne]=फारसी (परà¥à¤¸à¤¿à¤¯à¤¨) -Name[nl]=Farsi (Perzisch) -Name[nn]=Persisk -Name[pa]=ਫਾਰਸੀ (ਪਰਸ਼ੀਆਈ) -Name[pl]=Farsi (Perski) -Name[pt]=Farsi (Persa) -Name[pt_BR]=Farsi (Persa) -Name[ro]=Farsi (Persană) -Name[ru]=ФарÑи -Name[rw]=Igifarisi -Name[se]=Farsigiella (PersialaÅ¡) -Name[sk]=perzÅ¡tina -Name[sl]=Farsi (perzijsko) -Name[sr]=ФарÑи (ПерÑијÑки) -Name[sr@Latn]=Farsi (Persijski) -Name[sv]=Persiska -Name[ta]=பாரà¯à®šà®¿ (பெரà¯à®šà®¿à®¯à®©à¯) -Name[te]=ఫారà±à°¸à°¿ (పెరà±à°·à°¿à°¯à°¨à±) -Name[tg]=ФриÑианӣ -Name[th]=ภาษาฟาร์ซี (เปà¸à¸£à¹Œà¹€à¸‹à¸µà¸¢à¸™) -Name[tr]=Ä°ranca -Name[tt]=Farsı -Name[uk]=ФризійÑька (ПерÑька) -Name[uz]=Forscha (Perscha) -Name[uz@cyrillic]=ФорÑча (ПерÑча) -Name[vi]=Pha-xi -Name[wa]=Farsi -Name[zh_CN]=æ³¢æ–¯è¯ -Name[zh_HK]=波斯語 -Name[zh_TW]=波斯語 +Name=Persian [fi] Name=Finnish -Name[af]=Feense -Name[ar]=الÙنلندية -Name[az]=FincÉ™ -Name[be]=ФінÑÐºÐ°Ñ -Name[bg]=ФинÑки -Name[bn]=ফিনিশ -Name[br]=Finneg -Name[bs]=Finski -Name[ca]=Finès -Name[cs]=Finský -Name[csb]=Finsczi -Name[cy]=Ffineg -Name[da]=Finsk -Name[de]=Finnisch -Name[el]=Φιλανδικά -Name[eo]=Fina -Name[es]=Finés -Name[et]=Soome -Name[eu]=Finlandiera -Name[fa]=Ùنلاندی -Name[fi]=Suomi -Name[fr]=Finnois -Name[fy]=Finsk -Name[ga]=Fionlainnis -Name[gl]=Finlandés -Name[he]=×¤×™× ×™×ª -Name[hi]=फिनिश -Name[hr]=Finski -Name[hsb]=Finsce -Name[hu]=Finn -Name[id]=Finlandia -Name[is]=Finnska -Name[it]=Finlandese -Name[ja]=フィンランド語 -Name[ka]=ფინური -Name[kk]=Финнша -Name[km]=ហ្វាំងឡង់ -Name[ko]=핀란드어 -Name[lb]=Finnesch -Name[lt]=Suomių -Name[lv]=Somu -Name[mi]=Reo Whinarana -Name[mk]=ФинÑки -Name[mn]=ФиннлÑнд -Name[mt]=Finlandiż -Name[nb]=Finsk -Name[nds]=Finnsch -Name[ne]=फिनिश -Name[nl]=Fins -Name[nn]=Finsk -Name[nso]=Se-Finnish -Name[oc]=Finlandès -Name[pa]=ਫੈਨਿਸ਼ -Name[pl]=FiÅ„ski -Name[pt]=Finlandês -Name[pt_BR]=Finlandês -Name[ro]=Finlandeză -Name[ru]=ФинÑкий -Name[rw]=Ikinyafinilande -Name[se]=Suomagiella -Name[sk]=fÃnÄina -Name[sl]=finsko -Name[sq]=Finlandisht -Name[sr]=ФинÑки -Name[sr@Latn]=Finski -Name[ss]=Si-Finnish -Name[sv]=Finska -Name[ta]=ஃபினà¯à®©à®¿à®·à¯ -Name[te]=à°«à°¿à°¨à±à°¨à°¿à°·à± -Name[tg]=Финӣ -Name[th]=ภาษาฟินà¹à¸¥à¸™à¸”์ -Name[tr]=Fince -Name[tt]=Finçä -Name[uk]=ФінÑька -Name[uz]=Fincha -Name[uz@cyrillic]=Финча -Name[vi]=Phần-lan -Name[wa]=Finwès -Name[zh_CN]=èŠ¬å…°è¯ -Name[zh_HK]=芬è˜èªž -Name[zh_TW]=芬è˜èªž -Name[zu]=Isi-Finishi [fj] Name=Fijian -Name[ar]=Ùيجي -Name[az]=Fijiyaca -Name[be]=ФіджыйÑÐºÐ°Ñ -Name[bg]=Фиджи -Name[bn]=ফিজিয়ান -Name[br]=Fidjeg -Name[bs]=Fidžijski -Name[ca]=Fijà -Name[cs]=Fidžijský -Name[csb]=z Fiji -Name[cy]=Fijieg -Name[da]=Fijiansk -Name[de]=Fidschi -Name[eo]=FiÄia -Name[es]=Fiyiano -Name[et]=Fidži -Name[eu]=Fijiera -Name[fa]=Ùیجیایی -Name[fi]=Fidži -Name[fr]=Fidjien -Name[fy]=Fijdzjysk -Name[ga]=Fidsis -Name[gl]=Fijiano -Name[he]=פיגי'ת -Name[hi]=फिज़ी -Name[hr]=Fidžijski -Name[hsb]=Fidźiasce -Name[hu]=Fidzsi -Name[it]=Figiano -Name[ja]=フィジー語 -Name[ka]=ფიჯი -Name[kk]=Фиджише -Name[km]=ហ្វ៊ីហ្ស៊ី -Name[ko]=피지어 -Name[lb]=Fidschi-Sprooch -Name[lt]=Fidži -Name[lv]=Fidži -Name[mk]=ФиџиÑки -Name[mn]=Фижи -Name[nb]=Fijisk -Name[nds]=Fidschi -Name[ne]=फिजियन -Name[nl]=Fijisch -Name[nn]=Fijisk -Name[nso]=Se-Fijian -Name[pa]=ਫਿਜੀਨ -Name[pl]=z Fiji -Name[pt]=Fidjiano -Name[ro]=Fijiană -Name[ru]=Фиджи -Name[rw]=Igifijiyani -Name[se]=Fižigiella -Name[sk]=fidžijÄina -Name[sl]=fidžijsko -Name[sq]=Figjinisht -Name[sr]=ФиџијÑки -Name[sr@Latn]=Fidžijski -Name[ss]=Si-Fijian -Name[sv]=Fijianska -Name[ta]=ஃபிஜியன௠-Name[te]=ఫిజియనౠ-Name[tg]=Фиҷианӣ -Name[th]=ภาษาฟิจิ -Name[tt]=Fijiçä -Name[uk]=ФіджійÑька -Name[uz]=Fijicha -Name[uz@cyrillic]=Фижича -Name[vi]=Phi-gi -Name[wa]=Fidjyin -Name[zh_CN]=æ–æµŽè¯ -Name[zh_HK]=æ–濟語 -Name[zh_TW]=æ–濟語 -Name[zu]=Isi-Fijiyani [fo] Name=Faroese -Name[ar]=Ùروي -Name[az]=FaroezcÉ™ -Name[be]=ФароÑÐºÐ°Ñ -Name[bg]=ФарьорÑки -Name[bn]=ফারোইস -Name[br]=Faroeseg -Name[bs]=Farski -Name[ca]=Feroès -Name[cs]=Faerský -Name[csb]=z Ã’wczëch Ã’strowów -Name[cy]=Faroeg -Name[da]=Færøsk -Name[de]=Färöisch -Name[eo]=Feroa -Name[es]=Feroés -Name[et]=Fääri -Name[eu]=Faroera -Name[fa]=Ùاروسی -Name[fi]=Fääri -Name[fr]=Féroïen -Name[fy]=Faeroersk -Name[ga]=Faróis -Name[gl]=Feroés -Name[he]=פ×רו×ית -Name[hi]=फ़ारसी -Name[hr]=Farski -Name[hsb]=Farösce -Name[hu]=Faröei -Name[is]=Færeyska -Name[ja]=フェーãƒãƒ¼èªž -Name[ka]=ფáƒáƒ ერული -Name[kk]=ФароÑзше -Name[km]=ហ្វាអáŸážšáž¼ážŸážº -Name[lb]=Faröesch -Name[lt]=Farerų -Name[lv]=FÄ“ru -Name[mk]=ФарÑки -Name[mn]=Фаро -Name[nb]=Færøyisk -Name[nds]=Färöösch -Name[ne]=फारोसी -Name[nn]=Færøysk -Name[nso]=Se-Faroese -Name[pa]=ਫਾਰੋਇਸੀ -Name[pl]=z Wysp Owczych -Name[pt]=Faroês -Name[ro]=Faroeză -Name[ru]=ФарерÑкий -Name[rw]=Igifero -Name[se]=Fearagiella -Name[sk]=faerÄina -Name[sl]=fersko -Name[sq]=Farosisht -Name[sr]=ФарÑки -Name[sr@Latn]=Farski -Name[ss]=Si-Faroese -Name[sv]=Färöiska -Name[ta]=ஃபாரோவீஸ௠-Name[te]=ఫారొఈసౠ-Name[tg]=ФароеÑÓ£ -Name[th]=ภาษาฟาโรà¸à¸µà¸ª -Name[tt]=Farosça -Name[uk]=ФарерÑька -Name[uz]=Farercha -Name[uz@cyrillic]=Фарерча -Name[vi]=Pha-rô -Name[wa]=Faeroyès -Name[zh_CN]=æ³•ç½—ç¾¤å²›è¯ -Name[zh_HK]=法羅語 -Name[zh_TW]=法羅語 -Name[zu]=Isi-Faroese [fr] Name=French -Name[af]=Franse -Name[ar]=الÙرنسية -Name[az]=Fransızca -Name[be]=ФранцузÑÐºÐ°Ñ -Name[bg]=ФренÑки -Name[bn]=ফরাসী -Name[br]=Galleg -Name[bs]=Francuski -Name[ca]=Francès -Name[cs]=Francouzský -Name[csb]=Francësczi -Name[cy]=Frangeg -Name[da]=Fransk -Name[de]=Französisch -Name[el]=Γαλλικά -Name[eo]=Franca -Name[es]=Francés -Name[et]=Prantsuse -Name[eu]=Frantsesa -Name[fa]=Ùرانسوی -Name[fi]=Ranska -Name[fr]=Français -Name[fy]=Frânsk -Name[ga]=Fraincis -Name[gl]=Francés -Name[he]=צרפתית -Name[hi]=फà¥à¤°à¥‡à¤‚च -Name[hr]=Francuski -Name[hsb]=Francosce -Name[hu]=Francia -Name[id]=Prancis -Name[is]=Franska -Name[it]=Francese -Name[ja]=フランス語 -Name[ka]=ფრáƒáƒœáƒ’ული -Name[kk]=Французша -Name[km]=បារាំង -Name[ko]=불어 -Name[lb]=Franzéisch -Name[lt]=PrancÅ«zų -Name[lv]=FranÄu -Name[mi]=Reo Parani -Name[mk]=ФранцуÑки -Name[mn]=Франц -Name[ms]=Perancis -Name[mt]=FranÄ‹iż -Name[nb]=Fransk -Name[nds]=Franzöösch -Name[ne]=फà¥à¤°à¥‡à¤¨à¥à¤š -Name[nl]=Frans -Name[nn]=Fransk -Name[nso]=Sefora -Name[oc]=Franchimand -Name[pa]=ਫਰੈਂਚ -Name[pl]=Francuski -Name[pt]=Francês -Name[pt_BR]=Francês -Name[ro]=Franceză -Name[ru]=ФранцузÑкий -Name[rw]=Igifaransa -Name[se]=Fránskkagiella -Name[sk]=francúzÅ¡tina -Name[sl]=francosko -Name[sq]=Frengjisht -Name[sr]=ФранцуÑки -Name[sr@Latn]=Francuski -Name[ss]=SiFrentji -Name[sv]=Franska -Name[ta]=பிரெனà¯à®šà¯ -Name[te]=à°«à±à°°à±†à°‚à°šà± -Name[tg]=ФранÑавӣ -Name[th]=ภาษาà¸à¸£à¸±à¹ˆà¸‡à¹€à¸¨à¸ª -Name[tr]=Fransızca -Name[tt]=Fransça -Name[uk]=Французька -Name[uz]=Fransuzcha -Name[uz@cyrillic]=Французча -Name[ven]=Mufura -Name[vi]=Pháp -Name[wa]=Francès -Name[xh]=Isifrentshi -Name[zh_CN]=æ³•è¯ -Name[zh_HK]=法語 -Name[zh_TW]=法語 -Name[zu]=Isi-Frentshi [fy] Name=Frisian -Name[ar]=الÙريزية -Name[az]=FriscÉ™ -Name[be]=ФрыÑійÑÐºÐ°Ñ -Name[bg]=ФризийÑки -Name[bn]=ফà§à¦°à¦¿à¦¸à¦¿à§Ÿà¦¾à¦¨ -Name[br]=Frisianeg -Name[bs]=Frizijski -Name[ca]=Frisó -Name[cs]=FrÃský -Name[csb]=Frizëjsczi -Name[cy]=Frisieg -Name[da]=Frisisk -Name[de]=Friesisch -Name[eo]=Frisa -Name[es]=Frisio -Name[et]=Friisi -Name[eu]=Frisiera -Name[fa]=Ùریسی -Name[fi]=Friisi -Name[fr]=Frison -Name[fy]=Frysk -Name[ga]=Freaslainnis -Name[gl]=FrÃsio -Name[he]=פריזי×× ×™×ª -Name[hi]=फà¥à¤°à¤¿à¤¸à¤¿à¤¯à¤¨ -Name[hr]=Frizijski -Name[hsb]=Frizisce -Name[hu]=FrÃz -Name[is]=FrÃsneska -Name[it]=Frisone -Name[ja]=フリジア語 -Name[ka]=ფრიზიული -Name[kk]=Фризше -Name[km]=ហ្វ្រីស៊ាន -Name[ko]=프리시안어 -Name[lb]=Friesesch -Name[lt]=Fryzų -Name[lv]=FrÄ«zieÅ¡u -Name[mk]=ФризиÑки -Name[mn]=Ð¤Ñ€Ð¸Ñ -Name[ms]=Frisia -Name[nb]=Frisisk -Name[nds]=Freesch -Name[ne]=फà¥à¤°à¤¿à¤¸à¤¿à¤¯à¤¨ -Name[nl]=Frysk -Name[nn]=Frisisk -Name[nso]=Se-Frisian -Name[pa]=ਫਰੀਸੀਨਿਸ -Name[pl]=Fryzyjski -Name[pt]=FrÃsio -Name[ro]=Frisiană -Name[ru]=ФризийÑкий -Name[rw]=Igifuriziyani -Name[se]=Frisagiella -Name[sk]=frÃzÅ¡tina -Name[sl]=frizijsko -Name[sq]=Frisisht -Name[sr]=ФризијÑки -Name[sr@Latn]=Frizijski -Name[ss]=Si-Frisian -Name[sv]=Frisiska -Name[ta]=ஃபரீசியன௠-Name[te]=à°«à±à°°à°¿à°¸à°¿à°¯à°¨à± -Name[tg]=Фризианӣ -Name[th]=ภาษาฟรีเชียน -Name[uk]=ФризійÑька -Name[uz]=Frizcha -Name[uz@cyrillic]=Фризча -Name[vi]=Ph-ri-xi -Name[wa]=Frizon -Name[zh_CN]=å¼—é‡Œæ–¯å…°è¯ -Name[zh_HK]=弗利然語 -Name[zh_TW]=弗利然語 -Name[zu]=Isi-Frisiyani [ga] -Name=Irish Gaelic -Name[af]=Ierse Gaelic -Name[be]=ІрландÑÐºÐ°Ñ Ð³Ð°Ð»ÑŒÑÐºÐ°Ñ -Name[bg]=ИрландÑки -Name[bn]=আইরিশ গেলিক -Name[br]=Iwerzhoneg eus Bro Iwerzhon -Name[bs]=Irski Gaelic -Name[ca]=Irlandès gaèlic -Name[cs]=Galský (irÅ¡tina) -Name[csb]=Irlandzczi Gaelic -Name[da]=Irsk gælisk -Name[de]=Irisches Gälisch -Name[eo]=Irlanda Gaela -Name[es]=Gaélico irlandés -Name[et]=Iiri gaeli -Name[eu]=Irlandar gaelikoa -Name[fa]=اسکاتلندی ایرلندی -Name[fi]=Irlannin gael -Name[fr]=Gaélique irlandais -Name[fy]=Iersk Gaelic -Name[ga]=Gaeilge -Name[gl]=Gaélico -Name[he]=×’×לית ×ירית -Name[hr]=Irski Galski -Name[hsb]=Gaelisce (Irska) -Name[hu]=Gall (Ãr) -Name[is]=Ãrsk gelÃska -Name[it]=Gaelico irlandese -Name[ja]=アイルランド系ゲール語 -Name[ka]=ირლáƒáƒœáƒ“იური (გáƒáƒšáƒ£áƒ ი) -Name[kk]=Ирланд галлша -Name[km]=អៀរឡង់ ហ្កែលិគ -Name[lb]=Irescht Gällesch -Name[mk]=ИрÑки галÑки -Name[nb]=Irsk gaelisk -Name[nds]=Irsch Gäälsch -Name[ne]=आइरिश गà¥à¤¯à¤¾à¤²à¤¿à¤• -Name[nl]=Gaelic (Iers) -Name[nn]=Gælisk (Irland) -Name[pa]=ਆਈਰਿਸ਼ ਗਾਈਲਿਕ -Name[pl]=Irlandzki Gaelic -Name[pt]=Galês da Irlanda -Name[pt_BR]=Irlandês "Gaelic" -Name[ro]=Galeză irlandeză -Name[ru]=ГалльÑкий (ИрландиÑ) -Name[rw]=Ikinyirilande Gayerike -Name[se]=IrlánddalaÅ¡ gaelagiella -Name[sk]=Ãrska gaelÄina -Name[sl]=irsko galsko -Name[sr]=ИрÑки галÑки -Name[sr@Latn]=Irski galski -Name[sv]=Irländsk galiciska -Name[ta]=à®à®°à®¿à®·à¯ காலிக௠-Name[te]=à°à°°à°¿à°·à± గెలికౠ-Name[tg]=Ирландӣ (Галикӣ) -Name[th]=ภาษาไà¸à¸£à¸´à¸Šà¹€à¸à¸¥à¸´à¸„ -Name[tr]=Ä°rlanda Galik -Name[tt]=Galça (Ä°rland) -Name[uk]=ГаельÑька (ІрландіÑ) -Name[vi]=Xen-tợ Ãi-nhÄ©-lan -Name[zh_CN]=çˆ±å°”å…°ç›–å°”è¯ -Name[zh_TW]=（愛爾è˜ï¼‰è“‹çˆ¾èªž +Name=Irish [gd] Name=Gaelic -Name[ar]=غالي -Name[az]=QaelikcÉ™ -Name[be]=ГальÑÐºÐ°Ñ -Name[bg]=ГаелÑки -Name[bn]=গেলিক -Name[br]=Iwerzhoneg -Name[ca]=Gaèlic -Name[cs]=Galský -Name[csb]=Celtycczi (gaelic) -Name[cy]=Gaeleg -Name[da]=Gælisk -Name[de]=Gälisch -Name[eo]=Gaela -Name[es]=Gaélico -Name[et]=Gaeli -Name[eu]=Gaelikoa -Name[fa]=اسکاتلندی -Name[fi]=Gael -Name[fr]=Gaélique -Name[ga]=Gà idhlig -Name[gl]=Gaélico -Name[he]=×’×לית -Name[hi]=गैलिक -Name[hr]=Galski -Name[hsb]=Gaelisce -Name[hu]=Gall -Name[is]=GelÃska -Name[it]=Gaelico -Name[ja]=ゲール語 -Name[ka]=გáƒáƒšáƒ£áƒ ი -Name[kk]=Галлша -Name[km]=ហ្កែលិគ -Name[lb]=Gällesch -Name[lt]=Galų -Name[mk]=ГалÑки -Name[mn]=Гаели -Name[nb]=Gælisk -Name[nds]=Gäälsch -Name[ne]=गà¥à¤¯à¤¾à¤²à¤¿à¤• -Name[nn]=Gælisk -Name[nso]=Se-Gaelic -Name[pa]=ਗਾਈਲਿਕ -Name[pl]=celtycki (gaelic) -Name[pt]=Galês -Name[pt_BR]=Galês -Name[ro]=Galică -Name[ru]=ГалльÑкий -Name[rw]=Ikinyagayeli -Name[se]=Gaelagiella -Name[sk]=gaelÄina -Name[sl]=galsko -Name[sq]=Galikisht -Name[sr]=ГалÑки -Name[sr@Latn]=Galski -Name[ss]=Si-Gaelic -Name[sv]=Galiciska -Name[ta]=கேலிக௠-Name[te]=గెలికౠ-Name[tg]=Галӣ -Name[th]=ภาษาเà¸à¸¥à¸´à¸„ีย -Name[tr]=Galik -Name[tt]=Galça -Name[uk]=ГаельÑька -Name[uz]=Galikcha -Name[uz@cyrillic]=Галикча -Name[vi]=Xen-tợ -Name[wa]=Gayel -Name[zh_CN]=ç›–å°”è¯ -Name[zh_HK]=蓋爾語 -Name[zh_TW]=蓋爾語 -Name[zu]=Isi-Gayelikhi [gl] Name=Galician -Name[be]=ГаліцыйÑÐºÐ°Ñ -Name[bg]=ГалиÑийÑки -Name[bn]=গেলিসিয়ান -Name[br]=Galiseg -Name[bs]=Galicijski -Name[ca]=Gallec -Name[cs]=HaliÄský -Name[csb]=Galicëjsczi -Name[cy]=Galiseg -Name[da]=Galicisk -Name[de]=Galicisch -Name[eo]=Gaela -Name[es]=Gallego -Name[et]=Galeegi -Name[eu]=Galiziera -Name[fa]=اسکاتلندی -Name[fi]=Gallicia -Name[fr]=Gaélicien -Name[fy]=Galiciaansk -Name[ga]=GailÃsis -Name[gl]=Galego -Name[he]=×’×לית -Name[hr]=Galicijski -Name[hsb]=Galicisce -Name[hu]=GalÃciai -Name[is]=GelÃska -Name[it]=Gallego -Name[ja]=ガリシア語 -Name[ka]=გáƒáƒšáƒ˜áƒªáƒ˜áƒ£áƒ ი -Name[kk]=ГалициÑша -Name[km]=ហ្កាលីស៊ី -Name[lb]=Galizesch -Name[lt]=GalicieÄių -Name[lv]=GaliciÄņu -Name[mk]=ГалÑки -Name[mt]=GaliÄ‹ian -Name[nb]=Gaelisk -Name[nds]=Galizsch -Name[ne]=गà¥à¤¯à¤¾à¤²à¤¿à¤¸à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Galicisch -Name[nn]=Galisisk -Name[pa]=ਗਾਈਲੀਅਨ -Name[pl]=Galicyjski -Name[pt]=Galego -Name[pt_BR]=Galês -Name[ro]=Galică -Name[ru]=ГалицийÑкий -Name[rw]=Ikinyagalisiya -Name[se]=Galisiagiella -Name[sk]=galÃcijÄina -Name[sl]=galicijsko -Name[sr]=ГалицијÑки -Name[sr@Latn]=Galicijski -Name[sv]=Galiciska -Name[ta]=காலிசியன௠-Name[te]=గలిచియనౠ-Name[tg]=Галлӣ -Name[th]=ภาษาà¹à¸à¸¥à¸´à¹€à¸‹à¸µà¸¢ -Name[tr]=Galce -Name[tt]=Galisçä -Name[uk]=ГаліÑійÑька -Name[uz]=Galikcha -Name[uz@cyrillic]=Галикча -Name[ven]=Mugalata -Name[vi]=Ga-li-ci -Name[wa]=Galicyin -Name[xh]=isiGalacian -Name[zh_CN]=åŠ åˆ©è¥¿äºšè¯ -Name[zh_TW]=åŠ åˆ©è¥¿äºžèªž -Name[zu]=Isi-Galashiyani [gn] Name=Guarani -Name[ar]=غوراني -Name[az]=Quaranca -Name[be]=ГуÑрані -Name[bg]=Гуарани -Name[bn]=গà§à§Ÿà¦¾à¦°à¦¾à¦¨à¦¿ -Name[ca]=Guaranà -Name[el]=ΓκουαÏάνι -Name[eo]=Gvarania -Name[es]=Guaranà -Name[et]=Guaranii -Name[eu]=Guaraniera -Name[fa]=گوارانی -Name[ga]=Guaráinis -Name[he]=גו××¨× ×™ -Name[hi]=गौरानी -Name[hr]=Gvaranski -Name[ja]=グァラニ語 -Name[ka]=გვáƒáƒ áƒáƒœáƒ˜ -Name[kk]=Гуарани -Name[km]=ហ្កួរ៉ានី -Name[ko]=ê³¼ë¼ë‹ˆì–´ -Name[mk]=Гуарани -Name[mn]=Гуарани -Name[ne]=गà¥à¤µà¤¾à¤°à¤¾à¤¨à¥€ -Name[nso]=Se-Guarani -Name[pa]=ਗà©à¨°à¨¾à¨¨à©€ -Name[ro]=Guarană -Name[ru]=Гуарани -Name[rw]=Ikigwarani -Name[se]=Guaránagiella -Name[sk]=guaranà -Name[sl]=guarani -Name[sq]=Guaranisht -Name[sr]=ГваранÑки -Name[sr@Latn]=Gvaranski -Name[ss]=Si-Guarani -Name[sv]=Gujarati -Name[ta]=கà¯à®µà®°à®¾à®©à®¿ -Name[te]=à°—à±à°µà°¾à°°à°¾à°¨à°¿ -Name[tg]=Гуаранӣ -Name[th]=ภาษาà¸à¸§à¸²à¸£à¸²à¸™à¸µ -Name[tt]=Guarança -Name[uk]=Гуарані -Name[uz@cyrillic]=Гуарани -Name[vi]=Gua-ra-ni -Name[wa]=Gwarani -Name[zh_CN]=ç“œæ‹‰å°¼è¯ -Name[zh_HK]=瓜拉尼語 -Name[zh_TW]=瓜拉尼語 -Name[zu]=Isi-Guarani [gu] Name=Gujarati -Name[ar]=جوجوراتي -Name[az]=QujaraticÉ™ -Name[be]=ГуÑраці -Name[bg]=Гуджарати -Name[bn]=গà§à¦œà¦°à¦¾à¦¤à§€ -Name[br]=Gujaratieg -Name[eo]= GuÄarata -Name[et]=Gudžarati -Name[eu]=Gujaratera -Name[fa]=گجراتی -Name[fi]=Gudžarati -Name[ga]=Gúisearáitis -Name[gl]=Guxarati -Name[he]=גוג'רטית -Name[hi]=गà¥à¤œà¤°à¤¾à¤¤à¥€ -Name[hr]=Gudžaratski -Name[hu]=Gudzsarati -Name[id]=Gujarat -Name[ja]=グジャラート語 -Name[ka]=გუჯáƒáƒ áƒáƒ—ი -Name[kk]=Гуджарати -Name[km]=ហ្កុយ៉ារាទី -Name[ko]=구ìžë¼íŠ¸ì–´ -Name[lt]=Gudžarati -Name[mk]=Гујарати -Name[mn]=ГуÑрати -Name[nds]=Gudscharati -Name[ne]=गà¥à¤œà¤°à¤¾à¤¤à¥€ -Name[nso]=Se-Gujarati -Name[pa]=ਗà©à¨œà¨°à¨¾à¨¤à©€ -Name[ru]=Гуджарати -Name[rw]=Ikigujarati -Name[se]=Gujaratigiella -Name[sk]=gudžarátÄina -Name[sl]=gujarati -Name[sq]=Guxharatish -Name[sr]=ГујаратÑки -Name[sr@Latn]=Gujaratski -Name[ss]=Si-Gujarati -Name[ta]=கà¯à®œà®°à®¾à®¤à¯à®¤à®¿ -Name[te]=à°—à±à°œà°°à°¾à°¤à±€ -Name[tg]=Гӯҷаратӣ -Name[th]=ภาษาà¸à¸¹à¸ˆà¸²à¸£à¸²à¸•à¸µ -Name[uk]=ГуÑраті -Name[uz@cyrillic]=Гужарати -Name[vi]=Gu-gia-ra-ti -Name[wa]=Goudjarati -Name[zh_CN]=å¤å‰æ‹‰ç‰¹è¯ -Name[zh_HK]=å¤å‰æ‹‰ç‰¹èªž -Name[zh_TW]=å¤å‰æ‹‰ç‰¹èªž -Name[zu]=Isi-Gujarati [gv] Name=Manx -Name[ar]=مانكس -Name[az]=Manksca -Name[be]=ÐœÑÐ½ÐºÑ -Name[bg]=МанкÑки -Name[bn]=মানকà§à¦¸ -Name[br]=Manav -Name[cy]=Manneg -Name[da]=Mansk -Name[eo]=Manksa -Name[et]=Mänksi -Name[eu]=Manera -Name[fa]=مانکسی -Name[fr]=Mannois -Name[ga]=Manainnis -Name[he]=×ž× ×§×¡ -Name[hi]=मांकà¥à¤¸ -Name[hsb]=Manxowsce -Name[it]=Man, lingua dell'isola di -Name[ja]=マン島語 -Name[ka]=მáƒáƒœáƒ¥áƒ¡áƒ˜ -Name[kk]=МанкÑша -Name[km]=ម៉ុង -Name[ko]=ë§ìŠ¤ì–´ -Name[mk]=ÐœÐ°Ð½ÐºÑ -Name[mn]=ÐœÐ°Ð½ÐºÑ -Name[ne]=मà¥à¤¯à¤¾à¤™à¥à¤•à¥à¤¸ -Name[nso]=Se-Manx -Name[pa]=ਮਾਲਸ -Name[ro]=Manxă -Name[ru]=ÐœÐ°Ð½ÐºÑ -Name[rw]=Ikimangisi -Name[se]=Mánksagiella -Name[sk]=manÄina -Name[sl]=manx -Name[sq]=Manksisht -Name[sr]=МанкÑки -Name[sr@Latn]=Mankski -Name[ss]=Si-Manx -Name[ta]=மானà¯à®•à¯à®¸à¯ -Name[te]=మేనà±à°•à±à°¸à± -Name[tg]=МанкÑÓ£ -Name[th]=ภาษาà¹à¸¡à¸‡à¸‹à¹Œà¹€à¸à¸¥à¸´à¸„ -Name[tt]=Manksça -Name[uk]=ÐœÐ°Ð½ÐºÑ -Name[uz]=Manks -Name[uz@cyrillic]=ÐœÐ°Ð½ÐºÑ -Name[vi]=Man-xợ -Name[wa]=Gayel del Iye di Man -Name[zh_CN]=马æ©å²›è¯ -Name[zh_HK]=曼島語 -Name[zh_TW]=曼島語 -Name[zu]=Isi-Manx [ha] Name=Hausa -Name[ar]=الهاوسا -Name[be]=ХаўÑа -Name[bg]=ХауÑа -Name[bn]=হাউসা -Name[br]=Haousa -Name[eo]=HaÅsa -Name[fa]=هوسا -Name[fr]=Haoussa -Name[ga]=Hásais -Name[he]=×”×וסה -Name[hi]=हौसा -Name[ja]=ãƒã‚¦ã‚µèªž -Name[ka]=ჰáƒáƒ£áƒ¡áƒ -Name[kk]=ХауÑа -Name[km]=ហូសា -Name[ko]=하우사어 -Name[lb]=Haussa-Sprooch -Name[lv]=Hausu -Name[mk]=ХауÑа -Name[mn]=ХауÑа -Name[nds]=Haussa -Name[ne]=हउसा -Name[nso]=Se-Hausa -Name[pa]=ਹਾਉਸਾ -Name[ro]=Hausă -Name[ru]=ХауÑа -Name[rw]=Igihawusa -Name[se]=Hausagiella -Name[sk]=hauÅ¡tina -Name[sl]=hausa -Name[sq]=Hausisht -Name[sr]=ХауÑа -Name[ss]=Si-Hausa -Name[ta]=ஹவà¯à®šà®¾ -Name[te]=హౌసా -Name[tg]=ХауÑагӣ -Name[th]=ภาษาเฮาซา -Name[tt]=Hausça -Name[uk]=ГауÑа -Name[uz]=Xausa -Name[uz@cyrillic]=ХауÑа -Name[vi]=Hau-sa -Name[zh_CN]=è±ªæ’’è¯ -Name[zh_HK]=豪薩語 -Name[zh_TW]=豪薩語 -Name[zu]=Isi-Hausa [he] Name=Hebrew -Name[af]=Hibreüs -Name[ar]=العبرية -Name[az]=YÉ™hudicÉ™ -Name[be]=ГабрÑйÑÐºÐ°Ñ -Name[bg]=Иврит -Name[bn]=হীবà§à¦°à§ -Name[br]=Hebreeg -Name[bs]=Hebrejski -Name[ca]=Hebreu -Name[cs]=Hebrejský -Name[csb]=Hebrejsczi -Name[cy]=Iddeweg -Name[da]=Hebraisk -Name[de]=Hebräisch -Name[el]=ΕβÏαϊκά -Name[eo]=Hebrea -Name[es]=Hebreo -Name[et]=Heebrea -Name[eu]=Hebreera -Name[fa]=عبری -Name[fi]=Heprea -Name[fr]=Hébreu -Name[fy]=Hebrieuwsk -Name[ga]=Eabhrais -Name[gl]=Hebraico -Name[he]=עברית -Name[hi]=हिबà¥à¤°à¥‚ -Name[hr]=Hebrejski -Name[hsb]=Hebrejsce -Name[hu]=héber -Name[id]=Israel -Name[is]=Hebreska -Name[it]=Ebraico -Name[ja]=ヘブライ語 -Name[ka]=ივრითი -Name[kk]=Ивритше -Name[km]=áž áŸáž”្រូ -Name[ko]=히브리어 -Name[lb]=Hebräesch -Name[lt]=Hebrajų -Name[lv]=Ebreju -Name[mi]=Reo Hürai -Name[mk]=ЕврејÑки -Name[mn]=Хебрев -Name[mt]=Lhudi -Name[nb]=Hebraisk -Name[nds]=Hebrääsch -Name[ne]=हिबà¥à¤°à¥ -Name[nl]=Hebreeuws -Name[nn]=Hebraisk -Name[nso]=Se-Heberu -Name[oc]=Hebreu -Name[pa]=ਹੈਬਰਿਊ -Name[pl]=Hebrajski -Name[pt]=Hebreu -Name[pt_BR]=Hebreu -Name[ro]=Israeliană -Name[ru]=Иврит -Name[rw]=Igiheburayo -Name[se]=Hebreagiella -Name[sk]=hebrejÄina -Name[sl]=hebrejsko -Name[sq]=Hebraisht -Name[sr]=ХебрејÑки -Name[sr@Latn]=Hebrejski -Name[ss]=SiHebheru -Name[sv]=Hebreiska -Name[ta]=எபிரேயம௠-Name[te]=హీబà±à°°à±‚ -Name[tg]=Яҳудӣ -Name[th]=ภาษาฮิบรู -Name[tr]=Ä°branice -Name[tt]=Yähüdçä -Name[uk]=ЄврейÑька -Name[uz]=Yahudiycha -Name[uz@cyrillic]=Яҳудийча -Name[vi]=Do-thái -Name[wa]=Ebreu -Name[xh]=Isihebhere -Name[zh_CN]=希伯æ¥è¯ -Name[zh_HK]=希伯來語 -Name[zh_TW]=希伯來語 -Name[zu]=Isi-Hebheru [hi] Name=Hindi -Name[ar]=هندي -Name[be]=Хіндзі -Name[bg]=Хинди -Name[bn]=হিনà§à¦¦à§€ -Name[cs]=Hindský -Name[cy]=Hindw^ -Name[eo]=Hinda -Name[fa]=هندی -Name[fy]=Hindy -Name[ga]=Hiondúis -Name[he]=×”×™× ×“×™×ª -Name[hi]=हिनà¥à¤¦à¥€ -Name[hr]=Hinduski -Name[ja]=ヒンディー語 -Name[ka]=ჰინდი -Name[kk]=Хинди -Name[km]=ហិណ្ឌូ -Name[ko]=힌디어 -Name[lv]=Hindu -Name[mk]=Хинди -Name[mn]=Хинди -Name[ne]=हिनà¥à¤¦à¥€ -Name[nso]=Se-Hindi -Name[pa]=ਹਿੰਦੀ -Name[pt]=Hindu -Name[ro]=Hindusă -Name[ru]=Хинди -Name[rw]=Igihindi -Name[se]=Hindigiella -Name[sk]=hindÄina -Name[sl]=hindujsko -Name[sq]=Hinduisht -Name[sr]=Хинду -Name[sr@Latn]=Hindu -Name[ss]=Si-Hindi -Name[ta]=ஹிநà¯à®¤à®¿ -Name[te]=హింది -Name[tg]=Ҳиндӣ -Name[th]=ภาษาฮินดี -Name[tt]=Hindçä -Name[uk]=Гінді -Name[uz]=Hindcha -Name[uz@cyrillic]=Ҳиндча -Name[vi]=Hin-Ä‘i -Name[zh_CN]=北å°åº¦è¯ -Name[zh_HK]=北å°åº¦èªž -Name[zh_TW]=北å°åº¦èªž -Name[zu]=Isi-Hindi [ho] Name=Hiri Motu -Name[ar]=الهيري-موتو -Name[be]=Хірымоту -Name[bg]=Хири Моту -Name[bn]=হিরি মোটৠ-Name[eo]=Hiri-Motuo -Name[fa]=هیری موتو -Name[fi]=Hiri-motu -Name[fr]=Hiri motu -Name[ga]=HÃrÃ-Mótúis -Name[he]=הירי מוטו -Name[hi]=हिरी मोतू -Name[hu]=Hiri motu -Name[it]=Hiri motu -Name[ja]=ヒリモトゥ語 -Name[ka]=ჰირი მáƒáƒ¢áƒ£ -Name[kk]=Хири Моту -Name[km]=ហ៊ីរី ម៉ូទូ -Name[ko]=히리 모투어 -Name[lb]=Hiri-Motu -Name[mk]=Хири Моту -Name[mn]=Хири Моту -Name[ne]=हिरी मोतॠ-Name[nn]=Hiri motu -Name[nso]=Se-Hiri Motu -Name[pa]=ਹੀਰੀ ਮੋਟੂ -Name[ru]=Хири Моту -Name[rw]=Igihiri-motu -Name[se]=Hiri Motu-giella -Name[sk]=hiri motu -Name[sl]=hiri motu -Name[sr]=ХиримотÑки -Name[sr@Latn]=Hirimotski -Name[ss]=Si-Hiri Motu -Name[sv]=Hirimotu -Name[ta]=ஹிரி மொடà¯à®Ÿà¯ -Name[te]=హిరి మోటౠ-Name[tg]=Хири Моту -Name[th]=ภาษาฮิริโมตู -Name[uk]=Хірі Моту -Name[uz]=Xiri Motu -Name[uz@cyrillic]=Хири Моту -Name[vi]=Hi-ri-mô-tu -Name[zh_CN]=æ–°é‡Œæœ¨æ‰˜è¯ -Name[zh_HK]=Hiri Motu語 -Name[zh_TW]=Hiri Motu語 -Name[zu]=Isi-Hiri Motu [hr] Name=Croatian -Name[af]=Kroatiese -Name[ar]=الكرواتية -Name[az]=Xorvatca -Name[be]=Ð¥Ð°Ñ€Ð²Ð°Ñ†ÐºÐ°Ñ -Name[bg]=ХърватÑки -Name[bn]=কà§à¦°à§‹à§Ÿà§‡à¦¶à§€à§Ÿ -Name[br]=Kroateg -Name[bs]=Hrvatski -Name[ca]=Croat -Name[cs]=Chorvatský -Name[csb]=Chòrwacczi -Name[cy]=Croatieg -Name[da]=Kroatisk -Name[de]=Kroatisch -Name[el]=ΚÏοατικά -Name[eo]=Kroata -Name[es]=Croata -Name[et]=Horvaadi -Name[eu]=Kroaziera -Name[fa]=کروواسیایی -Name[fi]=Kroatia -Name[fr]=Croate -Name[fy]=Kroatysk -Name[ga]=Cróitis -Name[gl]=Croata -Name[he]=קרו×טית -Name[hi]=कà¥à¤°à¥‹à¤à¤¶à¤¿à¤¯à¤¨ -Name[hr]=Hrvatski -Name[hsb]=Chorwatsce -Name[hu]=Horvát -Name[id]=Kroasia -Name[is]=KróatÃska -Name[it]=Croato -Name[ja]=クãƒã‚¢ãƒã‚¢èªž -Name[ka]=ხáƒáƒ ვáƒáƒ¢áƒ£áƒšáƒ˜ -Name[kk]=Хорватша -Name[km]=ក្រូអាស៊ី -Name[ko]=í¬ë¡œì•„í‹°ì•„ì–´ -Name[lb]=Kroatesch -Name[lt]=Kroatų -Name[lv]=HorvÄtu -Name[mi]=Reo Koroätia -Name[mk]=ХрватÑки -Name[mn]=Хорват -Name[ms]=Croatia -Name[mt]=Kroat -Name[nb]=Kroatisk -Name[nds]=Kroaatsch -Name[ne]=कà¥à¤°à¥‹à¤¯à¤¸à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Kroatisch -Name[nn]=Kroatisk -Name[nso]=Se-Croatian -Name[oc]=Cròatian -Name[pa]=ਕਰੋਟੀਅਨ -Name[pl]=Chorwacki -Name[pt]=Croata -Name[pt_BR]=Croata -Name[ro]=Croată -Name[ru]=ХорватÑкий -Name[rw]=Ikinyakorowasi -Name[se]=Kroatiagiella -Name[sk]=chorvátÄina -Name[sl]=hrvaÅ¡ko -Name[sq]=Kroatisht -Name[sr]=ХрватÑки -Name[sr@Latn]=Hrvatski -Name[ss]=Si-Croatian -Name[sv]=Kroatiska -Name[ta]=கà¯à®°à¯Šà®µà¯‡à®šà®¿à®¯à®©à¯ -Name[te]=à°•à±à°°à±Šà°¯à±†à°·à°¿à°¯à°¨à± -Name[tg]=Хорватӣ -Name[th]=ภาษาโครเà¸à¹€à¸Šà¸µà¸¢à¸™ -Name[tr]=Hırvatça -Name[tt]=Kroatça -Name[uk]=ХорватÑька -Name[uz]=Xorvatcha -Name[uz@cyrillic]=Хорватча -Name[vi]=Cợ-rô-a-ti-a -Name[wa]=CrowÃ¥te -Name[zh_CN]=å…‹ç½—åœ°äºšè¯ -Name[zh_HK]=克羅地亞語 -Name[zh_TW]=克羅埃西亞語 -Name[zu]=Isi-Croatian [hsb] Name=Upper Sorbian -Name[af]=Hoog Serbiese -Name[be]=ВерхнÑÐ»ÑƒÐ¶Ñ‹Ñ†ÐºÐ°Ñ -Name[bg]=ГорноÑорбийÑки -Name[bn]=উচà§à¦š সারà§à¦¬à§€à§Ÿ -Name[br]=Sorab uhel -Name[bs]=Gornji lužiÄkosrpski -Name[ca]=Alt sòrab -Name[cs]=Hornolužicko srbský -Name[csb]=Górnosorbsczi -Name[cy]=Sorbieg Uchaf -Name[da]=Øvre Sorbisk -Name[de]=Obersorbisch -Name[eo]=Supra Soraba -Name[es]=Serbio superior -Name[et]=Ãœlemsorbi -Name[eu]=Goi Serbiera -Name[fa]=صربستان شمالی -Name[fi]=Yläsorbi -Name[fr]=Haut Sorabe -Name[fy]=Heech Sorbysk -Name[ga]=Sorbais Uachtarach -Name[gl]=Alto Sórabo -Name[he]=סרבית ×¢×œ×™×•× ×” -Name[hi]=अपर सरà¥à¤¬à¤¿à¤¯à¤¨ -Name[hr]=Gornjosrpski -Name[hsb]=Hornjoserbsce -Name[hu]=FelsÅ‘ szorb -Name[it]=Alto sorabo -Name[ja]=上ソルブ語 -Name[ka]=ზედáƒáƒ¡áƒáƒ ბული -Name[kk]=Жоғары Ñорбше -Name[km]=សូបៀន លើ -Name[lb]=Uewersorbesch -Name[mk]=Јужно лужички -Name[nb]=Øvresorbisk -Name[nds]=Böversorbsch -Name[ne]=माथिलà¥à¤²à¥‹ सोरà¥à¤¬à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Opper Sorbian -Name[nn]=Øvresorbisk -Name[pa]=ਉੱਪਰੀ ਸਰਬੀਅਨ -Name[pl]=GórnoÅ‚użycki -Name[pt]=Sérvio de Cima -Name[pt_BR]=Sérvio -Name[ro]=Sîrbă de Sus -Name[ru]=Верхнелужицкий -Name[rw]=Ikinyasorubiya cyo hejuru -Name[se]=Bajil Sorbiagiella -Name[sk]=hornolužická srbÄina -Name[sl]=zgornjesorbijsko -Name[sr]=Горње лужичко ÑрпÑки -Name[sr@Latn]=Gornje lužiÄko srpski -Name[sv]=Högsorbiska -Name[ta]=அபà¯à®ªà®°à¯ செரà¯à®ªà®¿à®¯à®©à¯ -Name[te]=à°…à°ªà±à°ªà°°à± సొరà±à°¬à°¿à°¯à°¨à± -Name[tg]=ЛужаÑагии болоӣ -Name[th]=ภาษาซà¸à¸£à¹Œà¹€à¸šà¸µà¸¢à¸™à¸•à¸à¸™à¸šà¸™ -Name[tr]=Yukarı Sırpça -Name[tt]=Sorbça, Öske -Name[uk]=Верхньолужицька -Name[uz]=Yuqori Sorbcha -Name[uz@cyrillic]=Юқори Сорбча -Name[vi]=Xoa-bi muá»™n -Name[wa]=Hôt sorbyin -Name[zh_CN]=ç´¢å¸ƒè¯ -Name[zh_TW]=塞爾ç¶äºžèªž [hu] Name=Hungarian -Name[af]=Hongaars -Name[ar]=الهنغارية (المجرية) -Name[az]=Macarca -Name[be]=ВенгерÑÐºÐ°Ñ -Name[bg]=УнгарÑки -Name[bn]=হাঙà§à¦—ারীয় -Name[br]=Hungareg -Name[bs]=MaÄ‘arski -Name[ca]=Hongarès -Name[cs]=MaÄarský -Name[csb]=Madżarsczi -Name[cy]=Hwngareg -Name[da]=Ungarsk -Name[de]=Ungarisch -Name[el]=ΟυγγÏικά -Name[eo]=Hungara -Name[es]=Húngaro -Name[et]=Ungari -Name[eu]=Hungariera -Name[fa]=مجارستانی -Name[fi]=Unkari -Name[fr]=Hongrois -Name[fy]=Hongaarsk -Name[ga]=Ungáiris -Name[gl]=Húngaro -Name[he]=×”×•× ×’×¨×™×ª -Name[hi]=हंगेरियन -Name[hr]=MaÄ‘arski -Name[hsb]=Madźarsce -Name[hu]=Magyar -Name[id]=Hungaria -Name[is]=Ungverska -Name[it]=Ungherese -Name[ja]=ãƒãƒ³ã‚¬ãƒªãƒ¼èªž -Name[ka]=უნგრული -Name[kk]=Мажарша -Name[km]=ហុងគ្រី -Name[ko]=í—가리어 -Name[lb]=Ungaresch -Name[lt]=Vengrų -Name[lv]=UngÄru -Name[mi]=Reo Hanekari -Name[mk]=УнгарÑки -Name[mn]=Унгар -Name[ms]=Hungaria -Name[mt]=Ungeriż -Name[nb]=Ungarsk -Name[nds]=Ungaarsch -Name[ne]=हङà¥à¤—ेरेली -Name[nl]=Hongaars -Name[nn]=Ungarsk -Name[nso]=Se-Hungarian -Name[oc]=Hongarian -Name[pa]=ਹੰਗਰੀਅਨ -Name[pl]=WÄ™gierski -Name[pt]=Húngaro -Name[pt_BR]=Húngaro -Name[ro]=Maghiară -Name[ru]=ВенгерÑкий -Name[rw]=Ikinyahangariya -Name[se]=Ungárgiella -Name[sk]=maÄarÄina -Name[sl]=madžarsko -Name[sq]=Hungarisht -Name[sr]=МађарÑки -Name[sr@Latn]=MaÄ‘arski -Name[ss]=Si-Hungarian -Name[sv]=Ungerska -Name[ta]=ஹஙà¯à®•à¯‡à®°à®¿à®¯à®©à¯ -Name[te]=హంగెరియనౠ-Name[tg]=Венгерӣ -Name[th]=ภาษาฮังà¸à¸²à¹€à¸£à¸µà¸¢à¸™ -Name[tr]=Macarca -Name[tt]=Macarça -Name[uk]=УгорÑька -Name[uz]=Vengrcha -Name[uz@cyrillic]=Венгрча -Name[vi]=Hung-gia-lợi -Name[wa]=Hongrwès -Name[zh_CN]=åŒˆç‰™åˆ©è¯ -Name[zh_HK]=匈牙利語 -Name[zh_TW]=匈牙利語 -Name[zu]=Isi-Hangariyani [hy] Name=Armenian -Name[af]=Armeens -Name[ar]=أرمني -Name[az]=ErmÉ™nicÉ™ -Name[be]=ÐрмÑнÑÐºÐ°Ñ -Name[bg]=ÐрменÑки -Name[bn]=আরà§à¦®à§‡à¦¨à§€à§Ÿ -Name[br]=Armenieg -Name[bs]=Armenski -Name[ca]=Armeni -Name[cs]=Arménský -Name[csb]=ArmeÅ„sczi -Name[cy]=Armeineg -Name[da]=Armensk -Name[de]=Armenisch -Name[el]=ΑÏμενικά -Name[eo]=Armena -Name[es]=Armenio -Name[et]=Armeenia -Name[eu]=Armeniera -Name[fa]=ارمنی -Name[fi]=Armenia -Name[fr]=Arménien -Name[fy]=Armeensk -Name[ga]=Airméinis -Name[gl]=Arménio -Name[he]=××¨×ž× ×™×ª -Name[hi]=आरमेनियन -Name[hr]=Armenski -Name[hsb]=Armensce -Name[hu]=Örmény -Name[id]=Armenia -Name[is]=Armeskt -Name[it]=Armeno -Name[ja]=アルメニア語 -Name[ka]=სáƒáƒ›áƒ®áƒ£áƒ ი -Name[kk]=Ðрменше -Name[km]=អារមáŸáž“ី -Name[ko]=아르메니아어 -Name[lb]=Armenesch -Name[lt]=ArmÄ—nų -Name[lv]=Armēņu -Name[mk]=ЕрменÑки -Name[mn]=Ðрмен -Name[ms]=Armenia -Name[nb]=Armensk -Name[nds]=Armeensch -Name[ne]=आरà¥à¤®à¥‡à¤¨à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Armeens -Name[nn]=Armensk -Name[nso]=Se-Armenian -Name[pa]=ਅਰਮੀਅਨ -Name[pl]=OrmiaÅ„ski -Name[pt]=Arménio -Name[pt_BR]=Armênio -Name[ro]=Armenă -Name[ru]=ÐрмÑнÑкий -Name[rw]=Icyarumeniya -Name[se]=Armeniagiella -Name[sk]=arménÄina -Name[sl]=armensko -Name[sq]=Armenisht -Name[sr]=ЈерменÑки -Name[sr@Latn]=Jermenski -Name[ss]=Si-Armenian -Name[sv]=Armenska -Name[ta]=ஆரà¯à®®à¯€à®©à®¿à®¯à®©à¯ -Name[te]=à°…à°°à±à°®à±†à°¨à°¿à°¯à°¨à± -Name[tg]=Ðрманӣ -Name[th]=ภาษาà¸à¸²à¸£à¹Œà¹€à¸¡à¹€à¸™à¸µà¸¢ -Name[tr]=Ermenice -Name[tt]=Ärmänçä -Name[uk]=ВірменÑька -Name[uz]=Armancha -Name[uz@cyrillic]=Ðрманча -Name[vi]=Ãc-mê-ni -Name[wa]=Ã…rmenyin -Name[zh_CN]=äºšç¾Žå°¼äºšè¯ -Name[zh_HK]=亞美尼亞語 -Name[zh_TW]=亞美尼亞語 -Name[zu]=Isi-Armenian [hz] Name=Herero -Name[ar]=الهيريرو -Name[be]=Ð¥ÑÑ€Ñра -Name[bg]=Хереро -Name[bn]=হেরেরো -Name[cy]=Hausa -Name[eo]=Herera -Name[fa]=هررو -Name[ga]=Heiréiróis -Name[he]=הררו -Name[hi]=हेरेरो -Name[hu]=Hereró -Name[ja]=ヘレãƒèªž -Name[ka]=ჰერერრ-Name[kk]=Хереро -Name[km]=áž áŸážšáŸáž¢áž¼ -Name[ko]=í—¤ë ˆë¡œì–´ -Name[mk]=Хереро -Name[mn]=Хереро -Name[ne]=हेरेरो -Name[nso]=Se-Herero -Name[pa]=ਹੀਰੀਰੋ -Name[ro]=Hereră -Name[ru]=Ðреро -Name[rw]=Igiherero -Name[se]=Hererogiella -Name[sk]=hererÄina -Name[sl]=herero -Name[sq]=Herisht -Name[sr]=ХерерÑки -Name[sr@Latn]=Hererski -Name[ss]=Si-Herero -Name[ta]=ஹெரà¯à®°à¯‹ -Name[te]=హెరెరో -Name[tg]=ХерÑро -Name[th]=ภาษาเฮà¸à¹€à¸£à¹‚ร -Name[tt]=Hereroça -Name[uk]=Гереро -Name[uz]=Xerero -Name[uz@cyrillic]=Хереро -Name[vi]=He-re-rô -Name[zh_CN]=èµ«é›·ç½—è¯ -Name[zh_HK]=Herero語 -Name[zh_TW]=Herero語 -Name[zu]=Isi-Herero [ia] Name=Interlingua -Name[ar]=الإنترلينغوا -Name[az]=Ä°nterlinqua -Name[be]=ІнтÑрлінгуа -Name[bg]=Интерлингва -Name[bn]=ইনà§à¦Ÿà¦¾à¦°à¦²à¦¿à¦™à§à¦—à§à§Ÿà¦¾ -Name[eo]=Interlingvao -Name[fa]=میان زبانی -Name[ga]=Idirtheanga -Name[he]=××™× ×˜×¨×œ×™× ×’×•××” -Name[hi]=इंटरलिंगà¥à¤† -Name[ja]=インターリンガ -Name[ka]=ინტერლინგვრ-Name[kk]=Интерлингва -Name[km]=អ៊ីងážážºáž›áž¸áž„áž‚áŸážš -Name[ko]=êµì œì–´ (Interlingua) -Name[lv]=Interlingva -Name[mk]=Интерлингва -Name[mn]=Интерлингуа -Name[ne]=इनà¥à¤Ÿà¤°à¤²à¤¿à¤™à¥à¤—à¥à¤µà¤¾ -Name[nso]=Se-Interlingua -Name[pa]=ਇੰਟਰਲੀਗੂਆ -Name[pt_BR]=InterlÃngua -Name[ru]=Интерлингва -Name[rw]=Ikinyenterilinga -Name[sk]=interlingua -Name[sl]=interlingua -Name[sr]=ИнтерлингванÑки -Name[sr@Latn]=Interlingvanski -Name[ss]=Si-Interlingua -Name[ta]=இனà¯à®Ÿà¯†à®°à¯à®²à®¿à®™à¯à®•à¯à®µà®¾ -Name[te]=ఇంటరౠలింగà±à°µà°¾ -Name[tg]=Забони миёнрав -Name[th]=ภาษานานาชาติ -Name[tt]=Ä°nterlingua -Name[uk]=Інтерлінгва -Name[uz@cyrillic]=Интерлингуа -Name[ven]=Luambo lwa hothe -Name[vi]=In-tợ-lin-gua -Name[wa]=Interlingua (noû latén) -Name[zh_CN]=拉ä¸å›½é™…è¯(国际辅助è¯) -Name[zh_HK]=科技共通語 -Name[zh_TW]=科技共通語 -Name[zu]=Ulimi olufanayo [id] Name=Indonesian -Name[af]=Indonesië -Name[ar]=الإندونيسية -Name[az]=Ä°ndoneziyaca -Name[be]=ІнданÑзійÑÐºÐ°Ñ -Name[bg]=ИндонезийÑки -Name[bn]=ইনà§à¦¦à§‹à¦¨à§‡à¦¶à§€à§Ÿ -Name[br]=Indoneseg -Name[bs]=Indonezijski -Name[ca]=Indonesi -Name[cs]=Indonéský -Name[csb]=Indonezëjsczi -Name[cy]=Indonesieg -Name[da]=Indonesisk -Name[de]=Indonesisch -Name[el]=Ινδονησιακά -Name[eo]=Indonezia -Name[es]=Indonesio -Name[et]=Indoneesia -Name[eu]=Indonesiera -Name[fa]=اندونزیایی -Name[fi]=Indonesia -Name[fr]=Indonésien -Name[fy]=Yndonesysk -Name[ga]=Indinéisis -Name[gl]=Bahasa Indonésia -Name[he]=××™× ×“×•× ×–×™×ª -Name[hi]=इंडोनेशियन -Name[hr]=Indonezijski -Name[hsb]=Indonezisce -Name[hu]=Indonéz -Name[id]=Indonesia -Name[is]=IndónesÃska -Name[it]=Indonesiano -Name[ja]=インドãƒã‚·ã‚¢èªž -Name[ka]=ინდáƒáƒœáƒ”ზიური -Name[kk]=ИндонезиÑша -Name[km]=ឥណ្ឌូនáŸážŸáŸŠáž¸ -Name[ko]=ì¸ë„네시아어 -Name[lb]=Indonesesch -Name[lt]=IndonezieÄių -Name[lv]=IndonÄ“zieÅ¡u -Name[mk]=ИндонезиÑки -Name[mn]=Индонези -Name[ms]=Indonesia -Name[mt]=Indoneżjan -Name[nb]=Indonesisk -Name[nds]=Indoneesch -Name[ne]=इनà¥à¤¡à¥‹à¤¨à¥‡à¤¸à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Indonesisch -Name[nn]=Indonesisk -Name[nso]=Se-Indonesian -Name[pa]=ਇੰਡੋਨੇਸ਼ੀਆ -Name[pl]=Indonezyjski -Name[pt]=Indonésio -Name[pt_BR]=Indonésio -Name[ro]=Indoneziană -Name[ru]=ИндонезийÑкий -Name[rw]=Ikinyendonisiya -Name[se]=Indonesiagiella -Name[sk]=indonézÅ¡tina -Name[sl]=indonezijsko -Name[sq]=Indonezisht -Name[sr]=ИндонезијÑки -Name[sr@Latn]=Indonezijski -Name[ss]=Si-Indonesian -Name[sv]=Indonesiska -Name[ta]=இநà¯à®¤à¯‹à®©à¯€à®šà®¿à®¯à®©à¯ -Name[te]=ఇనà±à°¡à±Šà°¨à±†à°·à°¿à°¯à°¨à± -Name[tg]=Индонезӣ -Name[th]=ภาษาà¸à¸´à¸™à¹‚ดนีเซีย -Name[tr]=Ä°ndonezya dili -Name[tt]=Ä°ndonesçä -Name[uk]=ІндонезійÑька -Name[uz]=Indonezcha -Name[uz@cyrillic]=Индонезча -Name[vi]=Nam-dÆ°Æ¡ng -Name[wa]=Indonezyin -Name[zh_CN]=å°åº¦å°¼è¥¿äºšè¯ -Name[zh_HK]=å°å°¼èªž -Name[zh_TW]=å°å°¼èªž -Name[zu]=Indoneshiya [ie] Name=Interlingue -Name[ar]=الإنترلينغوي -Name[be]=ІнтÑрлінг -Name[bg]=ОкÑидентал -Name[bn]=ইনà§à¦Ÿà¦¾à¦°à¦²à¦¿à¦‚ -Name[br]=Interlingeg -Name[eo]=Interlingveo -Name[es]=Interlinga -Name[fa]=میان زبانی -Name[fy]=Interlingua -Name[ga]=Idirtheanga iartharach -Name[gl]=Interlingua -Name[he]=××™× ×˜×¨×œ×™× ×’×•×•×” -Name[hi]=इंटरलिंग -Name[ja]=インターリング -Name[ka]=ინტერლინგვე -Name[kk]=Интерлигве -Name[km]=អ៊ីងážážºáž›áž¸áž„áž‚áž¹ -Name[ko]=êµì œì–´ (Interlingue) -Name[lb]=Interlingua -Name[lv]=Interlingva -Name[mk]=Интерлингва -Name[mn]=Интерлингуе -Name[ne]=इनà¥à¤Ÿà¤°à¤²à¤¿à¤™à¥à¤—à¥à¤µà¤¾ -Name[nso]=Se-Interlingue -Name[pa]=ਇੰਟਰਈਨੂਗੂਈ -Name[rw]=Ikinyenterilinge -Name[sk]=interlingue -Name[sl]=interlingue -Name[sr]=ИнтерлингвијÑки -Name[sr@Latn]=Interlingvijski -Name[ss]=Si-Interlingue -Name[sv]=Interlingua -Name[ta]=இனà¯à®Ÿà¯†à®°à¯à®²à®¿à®™à¯à®•à¯ -Name[te]=ఇంటరౠలింగె -Name[tg]=Забони миёнрав -Name[th]=ภาษาà¸à¸´à¸™à¹€à¸—à¸à¸£à¹Œà¸¥à¸´à¸‡à¸à¹Œ -Name[tt]=Ä°nterlingue -Name[uk]=Інтерлінгва -Name[uz@cyrillic]=Интерлингуе -Name[ven]=Luambo lwa hothe -Name[vi]=In-tợ-lin-guợ -Name[zh_CN]=è¯é™…è¯ -Name[zh_HK]=Interlingue語 -Name[zh_TW]=Interlingue語 -Name[zu]=Izilimi ezifanayo [ik] Name=Inupiaq -Name[ar]=الإنوبياك -Name[az]=Ä°nupiaqca -Name[be]=Ð†Ð½ÑƒÐ¿Ñ–Ñ†ÐºÐ°Ñ -Name[bg]=Инупиак -Name[bn]=ইনà§à¦ªà¦¿à§Ÿà¦¾à¦• -Name[br]=Inupiak -Name[bs]=Inupiak -Name[eo]=Inuita -Name[fa]=اینوپیاک -Name[fi]=Inupiatun -Name[he]=××™× ×•×¤×™×ק -Name[hi]=इनà¥à¤ªà¤¿à¤†à¤• -Name[hsb]=Inupiak -Name[hu]=Inupiak -Name[it]=Inupiak -Name[ja]=イヌピアック語 -Name[ka]=ინუპიáƒáƒ™áƒ˜ -Name[kk]=Инупиакша -Name[km]=អ៊ីនូភាគ -Name[mk]=Инупиак -Name[mn]=Инупиак -Name[nds]=Inupiak -Name[ne]=इनà¥à¤ªà¤¿à¤• -Name[nn]=Inupiak -Name[nso]=Se-Inupiaq -Name[pa]=ਇਨਪੀਕਾਉ -Name[ro]=Inupiacă -Name[ru]=Инупиак -Name[rw]=Ikinupiyake -Name[se]=Inupiaqgiella -Name[sk]=inupiaq -Name[sl]=inupiaq -Name[sq]=Inupikisht -Name[sr]=ИнупиакÑки -Name[sr@Latn]=Inupiakski -Name[ss]=Si-Inupiaq -Name[ta]=இனà¯à®ªà®¿à®¯à®¾à®•à¯ -Name[te]=ఇనà±à°ªà°¿à°¯à°¾à°•à± -Name[tg]=Инупиакӣ -Name[th]=ภาษาà¸à¸´à¸™à¸¸à¸žà¸´à¸à¸±à¸„ -Name[tt]=Ä°nupiaqça -Name[uk]=Інупіак -Name[uz]=Inupiak -Name[uz@cyrillic]=Инупиак -Name[vi]=I-nu-piac -Name[wa]=Inyupiak -Name[zh_CN]=å› çº½ä½©ç‰¹è¯ -Name[zh_HK]=Inupiaq語 -Name[zh_TW]=Inupiaq語 -Name[zu]=Isi-Inupiaq [io] Name=Ido -Name[ar]=الإيدو -Name[be]=Ідо -Name[bg]=Идо -Name[bn]=ইডো -Name[fa]=ایدو -Name[he]=×דו -Name[hi]=इडो -Name[ja]=イド語 -Name[ka]=იდრ-Name[kk]=Идо -Name[km]=អ៊ីឌូ -Name[ko]=ì´ë„ì–´ -Name[mk]=Идо -Name[mn]=Идо -Name[ne]=इडो -Name[nso]=Se-Ido -Name[pa]=ਆਈਡੋ -Name[ru]=Идо -Name[rw]=Ikido -Name[se]=Idogiella -Name[sk]=ido -Name[sl]=ido -Name[sq]=Idoisht -Name[sr]=ИдоÑки -Name[sr@Latn]=Idoski -Name[ss]=Si-Ido -Name[ta]=ஈடோ -Name[te]=ఇడొ -Name[tg]=Идо -Name[th]=ภาษาà¸à¸´à¸”ภ-Name[tt]=Ä°doça -Name[uk]=Ідо -Name[uz@cyrillic]=Идо -Name[vi]=I-đô -Name[zh_CN]=ä¼Šå¤šè¯ -Name[zh_HK]=伊多語 -Name[zh_TW]=伊多語 -Name[zu]=Isi-Ido [is] Name=Icelandic -Name[af]=Yslandies -Name[ar]=الآيسلندية -Name[az]=Ä°slandiyaca -Name[be]=ІÑландÑÐºÐ°Ñ -Name[bg]=ИÑландÑки -Name[bn]=আইসলà§à¦¯à¦¾à¦¨à§à¦¡à¦¿à¦• -Name[br]=Islandeg -Name[bs]=Islandski -Name[ca]=Islandès -Name[cs]=Islandský -Name[csb]=Islandzczi -Name[cy]=Islandeg -Name[da]=Islandsk -Name[de]=Isländisch -Name[el]=Ισλανδικά -Name[eo]=Islanda -Name[es]=Islandés -Name[et]=Islandi -Name[eu]=Islandiera -Name[fa]=ایسلندی -Name[fi]=Islanti -Name[fr]=Islandais -Name[fy]=Iislânsk -Name[ga]=Ãoslainnis -Name[gl]=Islandés -Name[he]=××™×¡×œ× ×“×™×ª -Name[hi]=आइसलैंडिक -Name[hr]=Islandski -Name[hsb]=Islandsce -Name[hu]=Izlandi -Name[id]=Islandia -Name[is]=Ãslenska -Name[it]=Islandese -Name[ja]=アイスランド語 -Name[ka]=ისლáƒáƒœáƒ“იური -Name[kk]=ИÑландша -Name[km]=អ៊ីស្លង់ -Name[ko]=ì•„ì´ìŠ¬ëž€ë“œì–´ -Name[lb]=Islännesch -Name[lt]=Islandų -Name[lv]=IslandieÅ¡u -Name[mi]=Reo Tiorangi -Name[mk]=ИÑландÑки -Name[mn]=ИÑланд -Name[mt]=Islandiż -Name[nb]=Islandsk -Name[nds]=Islannsch -Name[ne]=आइसलà¥à¤¯à¤¾à¤¨à¥à¤¡à¤¿à¤• -Name[nl]=IJslands -Name[nn]=Islandsk -Name[nso]=Se-Icelandic -Name[oc]=Islandès -Name[pa]=ਆਇਸਲੈਂਡ -Name[pl]=Islandzki -Name[pt]=Islandês -Name[pt_BR]=Islândico -Name[ro]=Islandeză -Name[ru]=ИÑландÑкий -Name[rw]=Ikinyisilande -Name[se]=Islánddagiella -Name[sk]=islandÄina -Name[sl]=islandsko -Name[sq]=Islandisht -Name[sr]=ИÑландÑки -Name[sr@Latn]=Islandski -Name[ss]=Si-Icelandic -Name[sv]=Isländska -Name[ta]=à®à®¸à¯à®²à®¾à®¨à¯à®¤à®¿à®•à¯ -Name[te]=à°à°¸à± లేండికౠ-Name[tg]=ИÑландӣ -Name[th]=ภาษาไà¸à¸‹à¹Œà¹à¸¥à¸™à¸”์ -Name[tr]=Ä°zlanda Dili -Name[tt]=Ä°slandça -Name[uk]=ІÑландÑька -Name[uz]=Islandcha -Name[uz@cyrillic]=ИÑландча -Name[vi]=Băng-đảo -Name[wa]=Izlandès -Name[zh_CN]=å†°å²›è¯ -Name[zh_HK]=冰島語 -Name[zh_TW]=冰島語 -Name[zu]=isi-Icelandic [it] Name=Italian -Name[af]=Italiaans -Name[ar]=الإيطالية -Name[az]=Ä°talyanca -Name[be]=ІтальÑнÑÐºÐ°Ñ -Name[bg]=ИталианÑки -Name[bn]=ইতালীয় -Name[br]=Italianeg -Name[bs]=Talijanski -Name[ca]=Italià -Name[cs]=Italský -Name[csb]=Italsczi -Name[cy]=Eidaleg -Name[da]=Italiensk -Name[de]=Italienisch -Name[el]=Ιταλικά -Name[eo]=Itala -Name[es]=Italiano -Name[et]=Itaalia -Name[eu]=Italiera -Name[fa]=ایتالیایی -Name[fi]=Italia -Name[fr]=Italien -Name[fy]=Italiaansk -Name[ga]=Iodáilis -Name[gl]=Italiano -Name[he]=×יטלקית -Name[hi]=इतालवी -Name[hr]=Talijanski -Name[hsb]=Italsce -Name[hu]=Olasz -Name[id]=Italia -Name[is]=Ãtalska -Name[it]=Italiano -Name[ja]=イタリア語 -Name[ka]=იტáƒáƒšáƒ˜áƒ£áƒ ი -Name[kk]=ИтальÑнша -Name[km]=អ៊ីážáž¶áž›áž¸ -Name[ko]=ì´íƒˆë¦¬ì•„ì–´ -Name[lb]=Italienesch -Name[lt]=Italų -Name[lv]=ItÄļu -Name[mi]=Reo Itari -Name[mk]=ИталијанÑки -Name[mn]=Итали -Name[ms]=Italia -Name[mt]=Taljan -Name[nb]=Italiensk -Name[nds]=Italieensch -Name[ne]=इटालियन -Name[nl]=Italiaans -Name[nn]=Italiensk -Name[nso]=Se-Italian -Name[pa]=ਇਤਾਲਵੀ -Name[pl]=WÅ‚oski -Name[pt]=Italiano -Name[pt_BR]=Italiano -Name[ro]=Italiană -Name[ru]=ИтальÑнÑкий -Name[rw]=Igitaliyani -Name[se]=Itáliagiella -Name[sk]=talianÄina -Name[sl]=italijansko -Name[sq]=Italisht -Name[sr]=ИталијанÑки -Name[sr@Latn]=Italijanski -Name[ss]=Sitaliyani -Name[sv]=Italienska -Name[ta]=இதà¯à®¤à®¾à®²à®¿à®¯à®©à¯ -Name[te]=ఇటాలియనౠ-Name[tg]=Итолиёӣ -Name[th]=ภาษาà¸à¸´à¸•à¸²à¹€à¸¥à¸µà¸¢à¸™ -Name[tr]=Ä°talyanca -Name[tt]=Ä°talça -Name[uk]=ІталійÑька -Name[uz]=Italyancha -Name[uz@cyrillic]=ИталÑнча -Name[vi]=à -Name[wa]=ItÃ¥lyin -Name[xh]=isitaliyane -Name[zh_CN]=æ„å¤§åˆ©è¯ -Name[zh_HK]=æ„大利語 -Name[zh_TW]=義大利語 -Name[zu]=Isi-Ntaliyane [iu] Name=Inuktitut -Name[ar]=الإنكتيتوت -Name[be]=Інуктытут -Name[bg]=Инуктитут -Name[bn]=ইনাকà§à¦Ÿà¦¿à¦Ÿà§à¦Ÿ -Name[fa]=اینوکتیتوت -Name[ga]=Ionúitis -Name[he]=××™× ×•×§×˜×™×˜×•×˜ -Name[hi]=इनà¥à¤•à¥à¤¤à¤¿à¤¤à¥ -Name[ja]=イヌイット語 -Name[ka]=ინუქტიუტუტი -Name[kk]=Инуктиут -Name[km]=អ៊ីនូកទីទូហ-Name[mk]=Инуктитут -Name[mn]=Инуктитут -Name[ne]=इनकà¥à¤Ÿà¤¿à¤Ÿà¥à¤Ÿ -Name[nn]=Inuittisk -Name[nso]=Se-Inuktitut -Name[pa]=ਇਨੂਕਟੀਟੂਟ -Name[ru]=Инуктитут -Name[rw]=Ikinukititutu -Name[se]=Inuhkagiella -Name[sk]=inuktitut -Name[sl]=inuktitut -Name[sq]=Inukituisht -Name[sr]=ИнуктитутÑки -Name[sr@Latn]=Inuktitutski -Name[ss]=Si-Inuktitut -Name[ta]=இனà¯à®•à¯à®Ÿà®¿à®Ÿà¯à®Ÿà¯ -Name[te]=ఇనà±à°•à±à°¤à°¿à°Ÿà±à°Ÿà± -Name[tg]=Инуктитут -Name[th]=ภาษาà¸à¸´à¸™à¸¸à¸„ทิทุท -Name[tt]=Ä°nuktitutça -Name[uk]=Інуктитут -Name[uz@cyrillic]=Инуктитут -Name[vi]=I-nuc-ti-túc -Name[zh_CN]=å› çº½ç‰¹è¯ -Name[zh_HK]=Inuktitut語 -Name[zh_TW]=Inuktitut語 -Name[zu]=Isi-Inuktitut [ja] Name=Japanese -Name[af]=Japanees -Name[ar]=اليابانية -Name[az]=Yaponca -Name[be]=ЯпонÑÐºÐ°Ñ -Name[bg]=ЯпонÑки -Name[bn]=জাপানী -Name[br]=Japaneg -Name[bs]=Japanski -Name[ca]=Japonès -Name[cs]=Japonský -Name[csb]=Japòńsczi -Name[cy]=Japaneg -Name[da]=Japansk -Name[de]=Japanisch -Name[el]=Ιαπωνικά -Name[eo]=Japana -Name[es]=Japonés -Name[et]=Jaapani -Name[eu]=Japoniera -Name[fa]=ژاپنی -Name[fi]=Japani -Name[fr]=Japonais -Name[fy]=Japansk -Name[ga]=Seapáinis -Name[gl]=Xaponés -Name[he]=×™×¤× ×™×ª -Name[hi]=जापानी -Name[hr]=Japanski -Name[hsb]=Japansce -Name[hu]=Japán -Name[id]=Jepang -Name[is]=Japanska -Name[it]=Giapponese -Name[ja]=日本語 -Name[ka]=იáƒáƒžáƒáƒœáƒ£áƒ ი -Name[kk]=Жапонша -Name[km]=ជប៉ុន -Name[ko]=ì¼ë³¸ì–´ -Name[lb]=Japanesch -Name[lt]=Japonų -Name[lv]=JapÄņu -Name[mi]=Reo Hapana -Name[mk]=ЈапонÑки -Name[mn]=Япон -Name[ms]=Jepun -Name[mt]=Ä appuniż -Name[nb]=Japansk -Name[nds]=Japaansch -Name[ne]=जापानी -Name[nl]=Japans -Name[nn]=Japansk -Name[nso]=Se-Japanese -Name[oc]=Japònès -Name[pa]=ਜਾਪਾਨੀ -Name[pl]=JapoÅ„ski -Name[pt]=Japonês -Name[pt_BR]=Japonês -Name[ro]=Japoneză -Name[ru]=ЯпонÑкий -Name[rw]=Ikiyapani -Name[se]=Jáhpangiella -Name[sk]=japonÄina -Name[sl]=japonsko -Name[sq]=Japonisht -Name[sr]=ЈапанÑки -Name[sr@Latn]=Japanski -Name[ss]=Si-Japanese -Name[sv]=Japanska -Name[ta]=ஜபà¯à®ªà®¾à®©à®¿à®¯à®®à¯ -Name[te]=జపనీసౠ-Name[tg]=Японӣ -Name[th]=ภาษาà¸à¸µà¹ˆà¸›à¸¸à¹ˆà¸™ -Name[tr]=Japonca -Name[tt]=Japança -Name[uk]=ЯпонÑька -Name[uz]=Yaponcha -Name[uz@cyrillic]=Японча -Name[ven]=Mudzhapani -Name[vi]=Nháºt -Name[wa]=Djaponès -Name[xh]=Isijapani -Name[zh_CN]=æ—¥è¯ -Name[zh_HK]=日語 -Name[zh_TW]=日語 -Name[zu]=Isi-Jaliphani [jv] Name=Javanese -Name[af]=Javanees -Name[ar]=جاويه -Name[az]=Yavonca -Name[be]=ЯванÑÐºÐ°Ñ -Name[bg]=ЯвайÑки -Name[bn]=জাà¦à¦¾à¦¨à¦¿à¦¸ -Name[br]=Javaneg -Name[bs]=Javanski -Name[ca]=Javanès -Name[cs]=Jávský -Name[csb]=JawaÅ„sczi -Name[cy]=Javaneg -Name[da]=Javansk -Name[de]=Javanisch -Name[eo]=Java -Name[es]=Javanés -Name[et]=Jaava -Name[eu]=Javera -Name[fa]=جاوانیز -Name[fi]=Jaava -Name[fr]=Javanais -Name[fy]=Javaansk -Name[ga]=Iávais -Name[gl]=Xavanés -Name[he]=×™×ווה -Name[hi]=जावानी (Javanese) -Name[hr]=Javanski -Name[hsb]=Jawanisce -Name[hu]=Jávai -Name[id]=Jawa -Name[it]=Giavanese -Name[ja]=ジャワ語 -Name[ka]=იáƒáƒ•áƒ -Name[kk]=Ява -Name[km]=យ៉ាវា -Name[ko]=ìžë°”ì–´ -Name[lb]=Javanesesch -Name[lt]=JavieÄių -Name[lv]=JavieÅ¡u -Name[mk]=ЈаванÑки -Name[mn]=Явон -Name[ms]=Jawa -Name[nb]=Javanesisk -Name[nds]=Javaneesch -Name[ne]=जाà¤à¤¾à¤¨à¤¿à¤œ -Name[nl]=Javanees -Name[nn]=Javanesisk -Name[nso]=Se-Javanese -Name[pa]=ਜਾਵਾਨੀਅਨ -Name[pl]=JawaÅ„ski -Name[pt]=Javanês -Name[pt_BR]=Javanês -Name[ro]=Iavaneză -Name[ru]=ЯванÑкий -Name[rw]=Ikijavani -Name[se]=Jávagiella -Name[sk]=jávÄina -Name[sl]=javansko -Name[sq]=Javonisht -Name[sr]=ЈаванÑки -Name[sr@Latn]=Javanski -Name[ss]=Si-Javanese -Name[sv]=Javanska -Name[ta]=ஜாவானீஸ௠-Name[te]=జావానీసౠ-Name[tg]=Ðвонӣ -Name[th]=ภาษาชวา -Name[tt]=Javaça -Name[uk]=ЯванÑька -Name[uz]=Yaavanez -Name[uz@cyrillic]=Яаванез -Name[vi]=Gia-va -Name[wa]=Djavanès -Name[zh_CN]=çˆªå“‡è¯ -Name[zh_HK]=爪哇語 -Name[zh_TW]=爪哇語 -Name[zu]=Isi-Javanisi [ka] Name=Georgian -Name[af]=Georgiën -Name[ar]=جورجي -Name[az]=GürcücÉ™ -Name[be]=ГрузінÑÐºÐ°Ñ -Name[bg]=ГрузинÑки -Name[bn]=জরà§à¦œà¦¿à§Ÿà¦¾à¦¨ -Name[br]=Jeorjieg -Name[bs]=Gruzijski -Name[ca]=Georgià -Name[cs]=GruzÃnský -Name[csb]=Grëzóńsczi -Name[cy]=Georgeg -Name[da]=Georgisk -Name[de]=Georgisch -Name[el]=ΓεωÏγιανά -Name[eo]=Kartvela -Name[es]=Georgiano -Name[et]=Gruusia -Name[eu]=Georgiera -Name[fa]=گرجی -Name[fi]=Georgia -Name[fr]=Géorgien -Name[fy]=Georgysk -Name[ga]=Seoirsis -Name[gl]=Xeorxiano -Name[he]=×’×¨×•×–×™× ×™×ª -Name[hi]=जà¥à¤¯à¥‰à¤°à¥à¤œà¤¿à¤¯à¤¨ -Name[hr]=Gruzijski -Name[hsb]=Gruzinsce -Name[hu]=Grúz -Name[is]=GeorgÃska -Name[it]=Georgiano -Name[ja]=グルジア語 -Name[ka]=ქáƒáƒ თული -Name[kk]=Грузинше -Name[km]=ហ្សកហ្ស៉ី -Name[ko]=그루지안어 -Name[lb]=Georgesch -Name[lt]=Gruzinų -Name[lv]=Gruzīņu -Name[mk]=ГрузиÑки -Name[mn]=Георги -Name[ms]=Georgia -Name[nb]=Georgisk -Name[nds]=Georgsch -Name[ne]=जरà¥à¤œà¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Georgisch -Name[nn]=Georgisk -Name[nso]=Se-Georgian -Name[pa]=ਜਾਰਜੀਆ -Name[pl]=GruziÅ„ski -Name[pt]=Geórgio -Name[pt_BR]=Geórgio -Name[ro]=Georgiană -Name[ru]=ГрузинÑкий -Name[rw]=Ikinyageworugiya -Name[se]=Grusiagiella -Name[sk]=gruzÃnÄina -Name[sl]=gruzijsko -Name[sq]=Xhorxhanisht -Name[sr]=ГрузијÑки -Name[sr@Latn]=Gruzijski -Name[ss]=Si-Georgian -Name[sv]=Georgiska -Name[ta]=ஜாரà¯à®œà®¿à®¯à®©à¯ -Name[te]=జారà±à°œà°¿à°¯à°¨à± -Name[tg]=Гурҷӣ -Name[th]=ภาษาจà¸à¸£à¹Œà¹€à¸ˆà¸µà¸¢à¸™ -Name[tr]=Gürcüce -Name[tt]=Görceçä -Name[uk]=ГрузинÑька -Name[uz]=Gruzincha -Name[uz@cyrillic]=Грузинча -Name[vi]=Gi-oa-gi-ạ -Name[wa]=Djeyordjyin -Name[zh_CN]=ä¹”æ²»äºšè¯ -Name[zh_HK]=喬治亞語 -Name[zh_TW]=喬治亞語 -Name[zu]=Isi-Jojiyani [ki] Name=Kikuyu -Name[ar]=الكيكويو -Name[az]=Kikuyuca -Name[be]=Кікую -Name[bg]=Кикю -Name[bn]=কিকà§à§Ÿà§ -Name[et]=Kikuju -Name[fa]=کیکویا -Name[fi]=Kikuju -Name[ga]=Ciocúis -Name[he]=קיקויו -Name[hi]=किकूयू -Name[hu]=Kikuju -Name[ja]=ã‚クユ語 -Name[ka]=კიკუიუ -Name[kk]=Кикую -Name[km]=គីគូយូ -Name[ko]=í‚¤ì¿ ìœ ì–´ -Name[lb]=Kikuyu-Sprooch -Name[mk]=Кикују -Name[mn]=Кикуюу -Name[ne]=किकà¥à¤¯à¥ -Name[nso]=Se-Kikuyu -Name[pa]=ਕਿਕੂਯੂ -Name[ru]=Кикую -Name[rw]=Ikikuyu -Name[se]=Kikujugiella -Name[sk]=kikuju -Name[sl]=kikuyu -Name[sq]=Kikuisht -Name[sr]=КикујÑки -Name[sr@Latn]=Kikujski -Name[ss]=Si-Kikuyu -Name[ta]=கியà¯à®•à¯ -Name[te]=à°•à°¿à°•à±à°¯à± -Name[tg]=КикуÑгӣ -Name[th]=ภาษาคิคุยุ -Name[tt]=Kikuyuça -Name[uk]=Кікуйю -Name[uz@cyrillic]=Кикуйу -Name[vi]=Ki-ku-yu -Name[zh_CN]=åŸºåº“å°¤è¯ -Name[zh_HK]=å‰åº«çŒ¶èªž -Name[zh_TW]=å‰åº«çŒ¶èªž -Name[zu]=Isi-Kikuyu [kk] Name=Kazakh -Name[ar]=كزخي -Name[az]=Qazaxca -Name[be]=КазахÑÐºÐ°Ñ -Name[bg]=КазахÑки -Name[bn]=কাজাখ -Name[br]=Kazakstaneg -Name[bs]=KazaÅ¡ki -Name[cs]=KazaÅ¡ský -Name[csb]=Kazachsczi -Name[de]=Kasachisch -Name[el]=Καζαχικά -Name[eo]=KazaÄ¥a -Name[es]=Kazajo -Name[et]=Kasahhi -Name[eu]=Kazakhera -Name[fa]=قزاق -Name[fi]=Kazakki -Name[ga]=Casaicis -Name[gl]=Cazaxo -Name[he]=קזחית -Name[hi]=कज़ाख -Name[hr]=KazaÄki -Name[hsb]=Kazachisce -Name[hu]=Kazah -Name[it]=Kazako -Name[ja]=カザフ語 -Name[ka]=ყáƒáƒ–áƒáƒ®áƒ£áƒ ი -Name[kk]=Қазақша -Name[km]=កាហ្សាក់ស្ážáž„់ -Name[ko]=ì¹´ìží¬ì–´ -Name[lb]=Kasachesch -Name[lt]=Kazachų -Name[lv]=Kazahu -Name[mk]=КазахÑтанÑки -Name[mn]=Казак -Name[nds]=Kasachsch -Name[ne]=कजाक -Name[nn]=Kasakhisk -Name[nso]=Se-Kazakh -Name[pa]=ਕਾਜ਼ਾਖ -Name[pl]=Kazachski -Name[pt]=Cazaquistanês -Name[ro]=Cazacă -Name[ru]=КазахÑкий -Name[rw]=Igikazaki -Name[se]=Kazakhagiella -Name[sk]=kazaÅ¡tina -Name[sl]=kazaÅ¡ko -Name[sq]=Kazakistanisht -Name[sr]=Казачки -Name[sr@Latn]=KazaÄki -Name[ss]=Si-Kazakh -Name[sv]=Kazakiska -Name[ta]=கசாக௠-Name[te]=కజాఖౠ-Name[tg]=Қазоқӣ -Name[th]=ภาษาคาซัคสถาน -Name[tt]=Qazaqça -Name[uk]=КазахÑька -Name[uz]=Qozoqcha -Name[uz@cyrillic]=Қозоқча -Name[vi]=Kha-xakh -Name[wa]=Kazaxh -Name[zh_CN]=哈è¨å…‹è¯ -Name[zh_HK]=哈薩克語 -Name[zh_TW]=哈薩克語 -Name[zu]=Isi-Kazakhi [kl] Name=Kalaallisut -Name[ar]=الكالاليسوت -Name[az]=Kalaallisutca -Name[be]=КалааліÑут -Name[bg]=КалиÑути -Name[bn]=কালালিসà§à¦Ÿ -Name[fa]=کالالیسوت -Name[fi]=Grönlanti -Name[ga]=Graonlainnis -Name[gl]=Groenlandés -Name[he]=קל×ליסוט -Name[hi]=कलालिसà¥à¤¤ -Name[hu]=Kalaalliszut -Name[ja]=グリーンランド語 -Name[ka]=კáƒáƒšáƒáƒáƒšáƒ˜áƒ¡áƒ£áƒ¢áƒ˜ -Name[kk]=КалаалиÑутша -Name[km]=កាឡាលីសាážáŸ‹ -Name[ko]=그린란드어 -Name[mk]=КалалиÑут -Name[mn]=КалааллиÑут -Name[ne]=कलालà¥à¤²à¤¿à¤¸à¥à¤Ÿ -Name[nn]=Grønlandsk -Name[nso]=Se-Kalaallisut -Name[pa]=ਕਾਲਾਆਲਿਸੂਟ -Name[ro]=Calalisută -Name[ru]=КалаалиÑут -Name[rw]=Igikalalisuti -Name[se]=Kalállisutgiella -Name[sk]=grónÄina -Name[sl]=kalaallisut -Name[sq]=Katalisht -Name[sr]=КалалиÑутÑки -Name[sr@Latn]=Kalalisutski -Name[ss]=Si-Kalaallisut -Name[sv]=Grönländska -Name[ta]=கலாலிசà¯à®Ÿà¯ -Name[te]=కలాలà±à°²à°¿à°¸à±à°¤à± -Name[tg]=КалаалиÑутӣ -Name[th]=ภาษาคาลัทลิซุท -Name[tt]=Kalaallisutça -Name[uk]=КалааліÑут -Name[uz@cyrillic]=КалааллиÑут -Name[vi]=Ka-lă-li-sút -Name[zh_CN]=æ ¼é™µå…°è¯ -Name[zh_HK]=Kalaallisut語 -Name[zh_TW]=Kalaallisut語 -Name[zu]=Isi-Kalaallisut [km] Name=Khmer -Name[ar]=خميري -Name[az]=XmercÉ™ -Name[be]=ХмерÑÐºÐ°Ñ -Name[bg]=КхмерÑки -Name[bn]=খমের -Name[br]=Kmereg -Name[bs]=Kmerski -Name[cs]=Kmérský -Name[csb]=Khmersczi -Name[eo]=Kmera -Name[et]=Khmeeri -Name[fa]=خمری -Name[ga]=Ciméiris -Name[he]=חמר -Name[hi]=खà¥à¤®à¥‡à¤° -Name[hr]=Kmerski -Name[ja]=クメール語 -Name[ka]=ქჰმერული -Name[kk]=Кхмерше -Name[km]=ážáŸ’មែរ -Name[ko]=캄보디아어 -Name[lt]=Khmerų -Name[lv]=Khmeru -Name[mk]=КмерÑки -Name[mn]=Хмер -Name[ne]=खमेर -Name[nso]=Se-Khmer -Name[pa]=ਖਮੀਰ -Name[pl]=Khmerski -Name[ro]=Kmeră -Name[ru]=КхмерÑкий -Name[rw]=Ikinyakime -Name[se]=Khmeragiella -Name[sk]=khmérÄina -Name[sl]=kmersko -Name[sq]=Kmerisht -Name[sr]=КмерÑки -Name[sr@Latn]=Kmerski -Name[ss]=Si-Khmer -Name[sv]=Kambodjanska -Name[ta]=கெமர௠-Name[te]=à°–à±à°®à±†à°°à± -Name[tg]=Хмерӣ -Name[th]=ภาษาเขมร -Name[tt]=Xmerçä -Name[uk]=КхмерÑька -Name[uz]=Kxmercha -Name[uz@cyrillic]=Кхмерча -Name[vi]=KhÆ¡-me -Name[wa]=Xhmer -Name[zh_CN]=é«˜æ£‰è¯ -Name[zh_HK]=高棉語 -Name[zh_TW]=高棉語 -Name[zu]=Isi-Khmer [kn] Name=Kannada -Name[af]=Kanadees -Name[ar]=الكانادا -Name[az]=Kannadaca -Name[be]=КанадÑÐºÐ°Ñ -Name[bg]=Каннада -Name[bn]=কনà§à¦¨à¦¾à¦¡à¦¾ -Name[br]=Kanada -Name[fa]=کانادایی -Name[ga]=Cannadais -Name[he]=×§× ×דה -Name[hi]=कनà¥à¤¨à¤¡à¤¼ -Name[ja]=カンナダ語 -Name[ka]=კáƒáƒœáƒœáƒáƒ“რ-Name[kk]=Каннада -Name[km]=កិណាដា -Name[mk]=Канада -Name[mn]=Канад -Name[ne]=कानाडा -Name[nso]=Se-Kannada -Name[pa]=ਕਾਨਡਾ -Name[pt_BR]=Canadá -Name[ro]=Kanada -Name[ru]=Каннада -Name[rw]=Iginyakanada -Name[se]=Kannadagiella -Name[sk]=kannadÄina -Name[sl]=kannada -Name[sq]=Kanadisht -Name[sr]=КанадÑки -Name[sr@Latn]=Kanadski -Name[ss]=Si-Kannada -Name[sv]=Kanaresiska -Name[ta]=கனà¯à®©à®Ÿà®®à¯ -Name[te]=à°•à°¨à±à°¨à°¡ -Name[tg]=Каннадӣ -Name[th]=ภาษาà¸à¸±à¸“ณาท -Name[tt]=Kannadça -Name[uk]=Каннада -Name[uz@cyrillic]=Каннада -Name[vi]=Ka-na-Ä‘a -Name[zh_CN]=åŽçº³å¾·è¯ -Name[zh_HK]=åŽé‚£é”語 -Name[zh_TW]=åŽé‚£é”語 -Name[zu]=Isi-Khanada [ko] Name=Korean -Name[af]=Koriaanse -Name[ar]=الكورية -Name[az]=Koreyaca -Name[be]=КарÑйÑÐºÐ°Ñ -Name[bg]=КорейÑки -Name[bn]=কোরীয় -Name[br]=Koreeg -Name[bs]=Korejski -Name[ca]=Coreà -Name[cs]=Korejský -Name[csb]=KòrejaÅ„sczi -Name[cy]=Koreëg -Name[da]=Koreansk -Name[de]=Koreanisch -Name[el]=ΚοÏεάτικα -Name[eo]=Korea -Name[es]=Coreano -Name[et]=Korea -Name[eu]=Koreera -Name[fa]=کره‌ای -Name[fi]=Korea -Name[fr]=Coréen -Name[fy]=Koareaansk -Name[ga]=Cóiréis -Name[gl]=Coreano -Name[he]=קורי×× ×™×ª -Name[hi]=कोरियाई -Name[hr]=Korejski -Name[hsb]=Koreansce -Name[hu]=Koreai -Name[id]=Korea -Name[is]=Kóreska -Name[it]=Coreano -Name[ja]=韓国語・æœé®®èªž -Name[ka]=კáƒáƒ ეული -Name[kk]=Корейше -Name[km]=កូរ៉០-Name[ko]=í•œêµì–´ -Name[lb]=Koreanesch -Name[lt]=KorÄ—jieÄių -Name[lv]=KorejieÅ¡u -Name[mk]=КорејÑки -Name[mn]=Ð¡Ð¾Ð»Ð¾Ð½Ð³Ð¾Ñ -Name[ms]=Korea -Name[nb]=Koreansk -Name[nds]=Koreaansch -Name[ne]=कोरियाली -Name[nl]=Koreaans -Name[nn]=Koreansk -Name[nso]=Se-Korean -Name[oc]=Còrean -Name[pa]=ਕੋਰੀਆਈ -Name[pl]=KoreaÅ„ski -Name[pt]=Coreano -Name[pt_BR]=Coreano -Name[ro]=Coreană -Name[ru]=КорейÑкий -Name[rw]=Igikoreya -Name[se]=Koreagiella -Name[sk]=kórejÄina -Name[sl]=korejsko -Name[sq]=Koreanisht -Name[sr]=КорејÑки -Name[sr@Latn]=Korejski -Name[ss]=SiKoriya -Name[sv]=Koreanska -Name[ta]=கொரியன௠-Name[te]=కొరియనౠ-Name[tg]=КореÑгӣ -Name[th]=ภาษาเà¸à¸²à¸«à¸¥à¸µ -Name[tr]=Korece -Name[tt]=Koreyçä -Name[uk]=КорейÑька -Name[uz]=Koreyscha -Name[uz@cyrillic]=КорейÑча -Name[vi]=Triều-tiên -Name[wa]=Coreyin -Name[xh]=Isikorea -Name[zh_CN]=æœé²œè¯ -Name[zh_HK]=韓國語 -Name[zh_TW]=韓國語 -Name[zu]=Isi-Korean [ks] Name=Kashmiri -Name[ar]=كشميري -Name[az]=KaÅŸmircÉ™ -Name[be]=КашмірÑÐºÐ°Ñ -Name[bg]=Кашмири -Name[bn]=কাশà§à¦®à§€à¦°à¦¿ -Name[bs]=KaÅ¡mirski -Name[cs]=KaÅ¡mÃrský -Name[csb]=Kaszmirsczi -Name[da]=Kashmirsk -Name[eo]=KaÅmira -Name[et]=KaÅ¡miiri -Name[eu]=Kaxmirera -Name[fa]=کشمیری -Name[fi]=KaÅ¡miri -Name[ga]=CaismÃris -Name[gl]=Caxemir -Name[he]=קשמירית -Name[hi]=कशà¥à¤®à¥€à¤°à¥€ -Name[hr]=KaÅ¡mirski -Name[hsb]=KaÅ¡mirsce -Name[hu]=KasmÃr -Name[id]=Kashmir -Name[it]=Cachemire, lingua del -Name[ja]=カシュミール語 -Name[ka]=ქáƒáƒ¨áƒ›áƒ˜áƒ ული -Name[kk]=Кашмирше -Name[km]=កាស្មៀរ -Name[ko]=카슈미르어 -Name[lt]=KaÅ¡miro -Name[lv]=KaÅ¡mirieÅ¡u -Name[mk]=КашмирÑки -Name[mn]=Кашмири -Name[nds]=Kaschmiirsch -Name[ne]=काशà¥à¤®à¤¿à¤°à¥€ -Name[nn]=Kasjmiri -Name[nso]=Se-Kashmiri -Name[pa]=ਕਸ਼ਮੀਰੀ -Name[pl]=Kaszmirski -Name[pt_BR]=Cashimira -Name[ro]=CaÅŸmiră -Name[ru]=КашмирÑкий -Name[rw]=Igikashimiri -Name[se]=KaÅ¡mirgiella -Name[sk]=kaÅ¡mÃrÄina -Name[sl]=kaÅ¡mirsko -Name[sq]=Kashmirisht -Name[sr]=КашмирÑки -Name[sr@Latn]=KaÅ¡mirski -Name[ss]=Si-Kashmiri -Name[ta]=காஷà¯à®®à¯€à®°à®¿ -Name[te]=à°•à°·à±à°®à±€à°°à±€ -Name[tg]=Кашмирӣ -Name[th]=ภาษาà¸à¸±à¸¨à¸¡à¸´à¸£à¸µ -Name[tt]=KaÅŸmirçä -Name[uk]=КашмірÑька -Name[uz]=Kashmircha -Name[uz@cyrillic]=Кашмирча -Name[vi]=Ka-x-mi-ri -Name[wa]=Cachmiri -Name[zh_CN]=å…‹ä»€ç±³å°”è¯ -Name[zh_HK]=喀什米爾語 -Name[zh_TW]=喀什米爾語 -Name[zu]=Isi-Kashimiri [ku] Name=Kurdish -Name[ar]=الكردية -Name[az]=KürdcÉ™ -Name[be]=КурдÑÐºÐ°Ñ -Name[bg]=КюрдÑки -Name[bn]=কà§à¦°à§à¦¦à¦¿à¦¶ -Name[br]=Kurdeg -Name[bs]=Kurdski -Name[ca]=Kurd -Name[cs]=Kurdský -Name[csb]=Kùrdijsczi -Name[cy]=Kwrdeg -Name[da]=Kurdisk -Name[de]=Kurdisch -Name[el]=ΚουÏδικά -Name[eo]=Kurda -Name[es]=Kurdo -Name[et]=Kurdi -Name[eu]=Turkiera -Name[fa]=کردی -Name[fi]=Kurdi -Name[fr]=Kurde -Name[fy]=Koerdysk -Name[ga]=Coirdis -Name[gl]=Kurdo -Name[he]=כורדית -Name[hi]=कà¥à¤°à¥à¤¦à¤¿à¤¶ -Name[hr]=Kurdski -Name[hsb]=Kurdisce -Name[hu]=Kurd -Name[id]=Kurdi -Name[is]=KúrdÃska -Name[it]=Curdo -Name[ja]=クルド語 -Name[ka]=ქურთული -Name[kk]=Курдше -Name[km]=ឃឺដ -Name[ko]=ì¿ ë¥´ë“œì–´ -Name[ku]=Kurdî -Name[lb]=Kurdesch -Name[lt]=Kurdų -Name[lv]=Kurdu -Name[mk]=КурдÑки -Name[mn]=Күрд -Name[mt]=Kurd -Name[nb]=Kurdisk -Name[nds]=Kurdsch -Name[ne]=कà¥à¤°à¥à¤¦à¤¿à¤¶ -Name[nl]=Koerdisch -Name[nn]=Kurdisk -Name[nso]=Se-Kurdish -Name[pa]=ਕà©à¨°à¨¦ -Name[pl]=Kurdyjski -Name[pt]=Curdo -Name[pt_BR]=Turco -Name[ro]=Curdă -Name[ru]=КурдÑкий -Name[rw]=Igikurudishi -Name[se]=Kurdigiella -Name[sk]=kurdÄina -Name[sl]=kurdsko -Name[sq]=Kurdisht -Name[sr]=КурдÑки -Name[sr@Latn]=Kurdski -Name[ss]=Si-Kurdish -Name[sv]=Kurdiska -Name[ta]=கà¯à®°à¯à®¤à®¿à®·à¯ -Name[te]=à°•à±à°°à±à°¦à°¿à°·à± -Name[tg]=Курдиш -Name[th]=ภาษาเคà¸à¸£à¹Œà¸”ิช -Name[tr]=Kürtçe -Name[tt]=Kördçä -Name[uk]=КурдÑька -Name[uz]=Kurdcha -Name[uz@cyrillic]=Курдча -Name[vi]=Kuổ-đị -Name[wa]=Kurdi -Name[zh_CN]=åº“å°”å¾·è¯ -Name[zh_HK]=庫德語 -Name[zh_TW]=庫德語 -Name[zu]=isi-Kurdish [kv] Name=Komi -Name[ar]=الكومي -Name[az]=KomicÉ™ -Name[be]=Комі -Name[bg]=КомизирÑнÑки -Name[bn]=কোমি -Name[csb]=z Komi -Name[eo]=Komia -Name[eu]=Komoreera -Name[fa]=Ú©Ù…ÛŒ -Name[ga]=Coimà -Name[he]=קומי -Name[hi]=कोमी -Name[ja]=コミ語 -Name[ka]=კáƒáƒ›áƒ˜ -Name[kk]=Коми -Name[km]=កូមី -Name[ko]=코미어 -Name[lb]=Komi-Sprooch -Name[mk]=Коми -Name[mn]=Коми -Name[ne]=कोमी -Name[nso]=Se-Komi -Name[pa]=ਕੋਮੀ -Name[pl]=z Komi -Name[ru]=Коми -Name[rw]=Igikomi -Name[se]=Komigiella -Name[sk]=komijÄina -Name[sl]=komi -Name[sq]=Komisht -Name[sr]=КомÑки -Name[sr@Latn]=Komski -Name[ss]=Si-Komi -Name[ta]=கோமி -Name[te]=కోమి -Name[tg]=Коми -Name[th]=ภาษาคà¸à¸¡à¸µ -Name[tt]=Komiçä -Name[uk]=Комі -Name[uz@cyrillic]=Коми -Name[vi]=Khô-mi -Name[zh_CN]=ç§‘ç±³è¯ -Name[zh_HK]=Komi語 -Name[zh_TW]=Komi語 -Name[zu]=Isi-Komi [kw] Name=Cornish -Name[ar]=كورنش -Name[az]=KorniÅŸcÉ™ -Name[be]=КорнÑÐºÐ°Ñ -Name[bg]=КорнуълÑки -Name[bn]=করà§à¦¨à¦¿à¦¶ -Name[br]=Korneveg -Name[bs]=Kornski -Name[cs]=KorniÅ¡ský -Name[csb]=Kòrnwalijsczi -Name[cy]=Cernyweg -Name[da]=Kornisk -Name[de]=Kornisch -Name[el]=ΚοÏνουαλικά -Name[eo]=Kornvala -Name[et]=Korni -Name[fa]=کرنیشی -Name[fi]=Korni -Name[fr]=Cornique -Name[fy]=Cornysk -Name[ga]=Coirnis -Name[gl]=Córnico -Name[he]=×§×•×¨× ×™×ª -Name[hi]=कॉरà¥à¤¨à¤¿à¤¶ -Name[hr]=Kornski -Name[hsb]=Kornisce -Name[hu]=Korn -Name[it]=Cornovaglia, lingua della -Name[ja]=コーンウォール語 -Name[ka]=კáƒáƒ ნუელური -Name[kk]=Корнуолше -Name[km]=កូនីស -Name[ko]=콘월어 -Name[lb]=Kornesch -Name[lt]=Kornų -Name[mk]=Корниш -Name[mn]=Корни -Name[nb]=Cornisk -Name[nds]=Kornisch -Name[ne]=करà¥à¤¨à¤¿à¤¸ -Name[nn]=Kornisk -Name[nso]=Se-Cornish -Name[pa]=ਕੋਰਨਿਸ਼ -Name[pl]=Kornwalijski -Name[pt]=Cornualho -Name[ro]=Corneză -Name[ru]=КорнуольÑкий -Name[rw]=Igikorunishe -Name[se]=Kornagiella -Name[sk]=kornÄina -Name[sl]=cornish -Name[sq]=Kornisht -Name[sr]=КорнÑки -Name[sr@Latn]=Kornski -Name[ss]=Si-Cornish -Name[sv]=Korniska -Name[ta]=கோரà¯à®©à®¿à®·à¯ -Name[te]=కొరà±à°¨à°¿à°·à± -Name[tg]=КорниÑгӣ -Name[th]=ภาษาคà¸à¸£à¹Œà¸™à¸´à¸Š -Name[tt]=Kornişçä -Name[uk]=КорнійÑька -Name[uz]=Korn -Name[uz@cyrillic]=Корн -Name[vi]=Xen-tợ Coanh-ouặn -Name[wa]=Cornike -Name[zh_CN]=åº·ç“¦å°”éƒ¡è¯ -Name[zh_HK]=康瓦耳語 -Name[zh_TW]=康瓦耳語 -Name[zu]=Isi-Khonishi [ky] Name=Kirghiz -Name[ar]=قرغيز -Name[az]=Qırğızca -Name[be]=КіргізÑÐºÐ°Ñ -Name[bg]=Киргизки -Name[bn]=কারà§à¦˜à¦¿à¦¸ -Name[br]=Kirgistaneg -Name[bs]=KirgiÅ¡ki -Name[cs]=Kyrgizský -Name[csb]=Kirgijsczi -Name[de]=Kirgisisch -Name[eo]=Kirgiza -Name[es]=Kirguiz -Name[et]=Kirgiisi -Name[eu]=Kirgiera -Name[fa]=قرقیزی -Name[fi]=Kirgiisi -Name[fr]=Kirghize -Name[fy]=Kirgizysk -Name[ga]=Cirgeastáinis -Name[gl]=Quirguize -Name[he]=קירגיזית -Name[hi]=किरà¥à¤—िज -Name[hr]=KirgiÅ¡ki -Name[hsb]=Kirgisce -Name[hu]=Kirgiz -Name[is]=KirgÃska -Name[it]=Chirghiso -Name[ja]=ã‚ルギス語 -Name[ka]=ყირგიზული -Name[kk]=Қырғызша -Name[km]=គៀរហ្គីស្ážáž„់ -Name[ko]=키르키즈어 -Name[lb]=Kirghisesch -Name[lt]=Kirgizų -Name[lv]=KirgÄ«zu -Name[mk]=КиргизтанÑки -Name[mn]=Киргиз -Name[nb]=Kirgisisk -Name[nds]=Kirgiisch -Name[ne]=कà¥à¤°à¤¿à¤—िज -Name[nl]=Kirghizisch -Name[nn]=Kirgisisk -Name[nso]=Se-Kirghiz -Name[pa]=ਕਿਰਘੀਜ਼ -Name[pl]=Kirgiski -Name[pt]=Quirguistanês -Name[ro]=Chirghiză -Name[ru]=КиргизÑкий -Name[rw]=Ikirigizi -Name[se]=Kirgisiagiella -Name[sk]=kirgizÅ¡tina -Name[sl]=kirgizijsko -Name[sq]=Kirgjizisht -Name[sr]=КиргиÑки -Name[sr@Latn]=Kirgiski -Name[ss]=Si-Kirghiz -Name[sv]=Kirghiziska -Name[ta]=கிரà¯à®•à®¿à®¸à¯ -Name[te]=à°•à°¿à°°à±à°˜à°¿à°œà± -Name[tg]=Кирғизӣ -Name[th]=ภาษาเคà¸à¸£à¹Œà¸à¸´à¸‹ -Name[tr]=Kırgız -Name[tt]=Qırğızça -Name[uk]=Киргизька -Name[uz]=QirgÊ»izcha -Name[uz@cyrillic]=Қирғизча -Name[vi]=Kia-gi-x -Name[wa]=Kirguize -Name[zh_CN]=å‰å°”å‰æ–¯è¯ -Name[zh_HK]=å‰çˆ¾å‰æ–¯èªž -Name[zh_TW]=å‰çˆ¾å‰æ–¯èªž -Name[zu]=Isi-Kirghizi [la] Name=Latin -Name[af]=Latyn -Name[ar]=لاتيني -Name[az]=Latınca -Name[be]=ЛацінÑÐºÐ°Ñ -Name[bg]=ЛатинÑки -Name[bn]=লাতিন -Name[bs]=Latinski -Name[ca]=Llatà -Name[cs]=Latina -Name[csb]=Åacëzna -Name[cy]=Lladin -Name[de]=Latein -Name[el]=Λατινικά -Name[eo]=Latino -Name[es]=LatÃn -Name[et]=Ladina -Name[eu]=Latina -Name[fa]=لاتین -Name[fi]=Latina -Name[fy]=Latyn -Name[ga]=Laidin -Name[he]=×œ×˜×™× ×™×ª -Name[hi]=लेटिन -Name[hr]=Latinski -Name[hsb]=Åaćonsce -Name[is]=LatÃna -Name[it]=Latino -Name[ja]=ラテン語 -Name[ka]=ლáƒáƒ—ინური -Name[kk]=Латынша -Name[km]=ឡាážáž¶áŸ†áž„ -Name[ko]=ë¼í‹´ì–´ -Name[lb]=Latäin -Name[lt]=Lotynų -Name[mk]=ЛатинÑки -Name[mn]=Латин -Name[nds]=Latiensch -Name[ne]=लà¥à¤¯à¤¾à¤Ÿà¤¿à¤¨ -Name[nl]=Latijn -Name[nso]=Se-Latin -Name[pa]=ਲੈਟਿਨ -Name[pl]=ÅaciÅ„ski -Name[pt]=Latim -Name[pt_BR]=Latim -Name[ro]=Latină -Name[ru]=ЛатинÑкий -Name[rw]=Ikilatini -Name[se]=Láhtengiella -Name[sk]=latinÄina -Name[sl]=latinsko -Name[sq]=Latinisht -Name[sr]=ЛатинÑки -Name[sr@Latn]=Latinski -Name[ss]=Si-Latin -Name[ta]=இலதà¯à®¤à¯€à®©à¯ -Name[te]=లాటినౠ-Name[tg]=Лотинӣ -Name[th]=ภาษาละติน -Name[tt]=LatÃnça -Name[uk]=ЛатинÑька -Name[uz]=Lotincha -Name[uz@cyrillic]=Лотинча -Name[vi]=La-tinh -Name[wa]=Latén -Name[zh_CN]=拉ä¸è¯ -Name[zh_HK]=拉ä¸èªž -Name[zh_TW]=拉ä¸èªž -Name[zu]=Isi-Lathini [lb] Name=Luxembourgish -Name[ar]=لوكسمبورغي -Name[az]=Lyuksemburqca -Name[be]=ЛюкÑембургÑÐºÐ°Ñ -Name[bg]=ЛюкÑембургÑки -Name[bn]=লাকà§à¦¸à§‡à¦®à¦¬à¦¾à¦°à§à¦—িশ -Name[br]=Luksembourgeg -Name[bs]=LuksemburÅ¡ki -Name[ca]=Luxemburguès -Name[cs]=Lucemburský -Name[csb]=Luksembùrsczi -Name[cy]=Luxembwrgeg -Name[de]=Luxemburgisch -Name[el]=ΛουξεμβουÏγικά -Name[eo]=Luksemburga -Name[es]=Luxemburgués -Name[et]=Luksemburgi -Name[eu]=Luxenburgera -Name[fa]=لوکزامبورگ -Name[fi]=Luxemburg -Name[fr]=Luxembourgeois -Name[fy]=Luksemboarchsk -Name[ga]=Lucsambuirgis -Name[gl]=Luxemburgués -Name[he]=לוקסמבורגית -Name[hi]=लकà¥à¤¸à¤®à¤¬à¤°à¥à¤—िश -Name[hr]=LuksemburÅ¡ki -Name[hsb]=Luksemburgsce -Name[hu]=Luxemburgi -Name[id]=Luxemburg -Name[is]=Lúxemborgiska -Name[it]=Lussemburghese -Name[ja]=ルクセンブルグ語 -Name[ka]=ლუქსემბურგული -Name[kk]=ЛюкÑимбургша -Name[km]=លុចហ្សំបួរ -Name[lb]=Lëtzebuergesch -Name[lt]=LiuksemburgieÄių -Name[lv]=LuksemburgieÅ¡u -Name[mk]=ЛукÑембургÑки -Name[mn]=ЛюькÑембүрг -Name[nb]=Luxemburgisk -Name[nds]=Luxemborgsch -Name[ne]=लगà¥à¤œà¥‡à¤®à¤¬à¤°à¥à¤—िस -Name[nl]=Letzenburgs -Name[nn]=Luxembourgsk -Name[nso]=Se-Luxembourgish -Name[pa]=ਲਕਸ਼ਬਰਗਸ਼ -Name[pl]=Luksemburski -Name[pt]=Luxemburguês -Name[pt_BR]=Luxemburgo -Name[ro]=Luxemburgheză -Name[ru]=ЛюкÑембургÑкий -Name[rw]=Ikinyalugizamburu -Name[se]=Luksenburggagiella -Name[sk]=luxemburÄina -Name[sl]=luksemburÅ¡ko -Name[sq]=Luksemburgisht -Name[sr]=ЛукÑембуршки -Name[sr@Latn]=LuksemburÅ¡ki -Name[ss]=Si-Luxembourgish -Name[sv]=Luxemburgiska -Name[ta]=லகà¯à®šà®®à¯à®ªà¯‹à®°à¯à®•à®¿à®·à¯ -Name[te]=లకà±à°¸à±†à°‚బరà±à°—à°¿à°·à± -Name[tg]=ЛюкÑембургӣ -Name[th]=ภาษาลัà¸à¹€à¸‹à¸¡à¹€à¸šà¸à¸£à¹Œà¸ -Name[tt]=Lüksemburgça -Name[uk]=ЛюкÑембурзька -Name[uz]=Lyuksemburgcha -Name[uz@cyrillic]=ЛюкÑембургча -Name[vi]=Lúc-xăm-buac -Name[wa]=Lussimbordjwès -Name[zh_CN]=å¢æ£®å ¡è¯ -Name[zh_HK]=ç›§æ£®å ¡èªž -Name[zh_TW]=ç›§æ£®å ¡èªž -Name[zu]=Isi-Luxembourgish [li] Name=Limburgan -Name[ar]=الليمبورغية -Name[az]=Limburqca -Name[be]=ЛімбургÑÐºÐ°Ñ -Name[bg]=ЛимбурганÑки -Name[bn]=লিমবারà§à¦—ান -Name[br]=Limburgeg -Name[bs]=LimburÅ¡ki -Name[ca]=Limburgà -Name[csb]=LimbùrgaÅ„sczi -Name[cy]=Limbwrgeg -Name[da]=Limburgansk -Name[de]=Limburgisch -Name[eo]=Limburga -Name[es]=Limburgano -Name[et]=Limburgi -Name[fa]=لیمبرگان -Name[fi]=Limburgi -Name[fr]=Limbourgeois -Name[fy]=Limburgsk -Name[ga]=Limbuirgis -Name[gl]=Limburgano -Name[he]=לימבורגית -Name[hi]=लिंबरगन -Name[hr]=LimburÅ¡ki -Name[hsb]=Limburgsce -Name[hu]=Limburgi -Name[is]=Limburgian -Name[it]=Limburghese -Name[ja]=リグリア語 -Name[ka]=ლიმბურგული -Name[kk]=Лимбургша -Name[km]=លីបួគ -Name[lb]=Limburgesch -Name[mk]=ЛимбурганÑки -Name[mn]=Лимбүрг -Name[nb]=Limburgisk -Name[nds]=Limborgsch -Name[ne]=लिमà¥à¤¬à¥à¤°à¤—न -Name[nl]=Limburgs -Name[nn]=Limburgsk -Name[nso]=Se-Limburgan -Name[pa]=ਲੀਮਬà©à¨°à¨—ਾਨ -Name[pl]=LimburgiaÅ„ski -Name[pt]=Limburguês -Name[ro]=Limburgană -Name[ru]=ЛимбуржÑкий -Name[rw]=Ikilimburigani -Name[se]=Limburggagiella -Name[sk]=limburÄina -Name[sl]=limburgan -Name[sq]=Limburganisht -Name[sr]=Лимбуршки -Name[sr@Latn]=LimburÅ¡ki -Name[ss]=Si-Limburgan -Name[sv]=Limburgiska -Name[ta]=லகà¯à®šà®®à¯à®ªà¯‡à®°à¯à®•à¯ -Name[te]=లింబరà±à°—నౠ-Name[tg]=Лимбурганӣ -Name[th]=ภาษาลิมเบà¸à¸£à¹Œà¸à¸±à¸™ -Name[tt]=Limburgça -Name[uk]=ЛімбурганÑька -Name[uz@cyrillic]=Лимбурган -Name[vi]=Lim-bua-ga -Name[wa]=Limbordjwès -Name[zh_CN]=æž—å ¡è¯ -Name[zh_HK]=Limburgan語 -Name[zh_TW]=Limburgan語 -Name[zu]=Isi-Lumburgan [ln] Name=Lingala -Name[ar]=اللينغالا -Name[az]=Linqalaca -Name[be]=ЛінгальÑÐºÐ°Ñ -Name[bg]=Лингала -Name[bn]=লিঙà§à¦—ালা -Name[br]=Lingaleg -Name[fa]=لینگالا -Name[he]=×œ×™× ×’×œ×” -Name[hi]=लिंगला -Name[hr]=Lingalski -Name[ja]=リンガラ語 -Name[ka]=ლინგáƒáƒšáƒ -Name[kk]=Лингата -Name[km]=លីនហ្កាឡា -Name[mk]=Лингала -Name[mn]=Лингала -Name[ne]=लिङà¥à¤—ाला -Name[nso]=Se-Lingala -Name[pa]=ਲੀਨਗਾਲਾ -Name[ro]=Lingală -Name[ru]=Лингала -Name[rw]=Ilingala -Name[se]=Lingalagiella -Name[sk]=lingalÄina -Name[sl]=lingala -Name[sq]=Lingalisht -Name[sr]=ЛингалÑки -Name[sr@Latn]=Lingalski -Name[ss]=Si-Lingala -Name[ta]=லிஙà¯à®•à®¾à®²à®¾ -Name[te]=లింగాలా -Name[tg]=Лингалӣ -Name[th]=ภาษาลิงà¸à¸²à¸¥à¸² -Name[tt]=Lingalaça -Name[uk]=Лінгала -Name[uz@cyrillic]=Лингала -Name[vi]=Lin-ga-la -Name[zh_CN]=æž—åŠ æ‹‰è¯ -Name[zh_HK]=Lingala語 -Name[zh_TW]=Lingala語 -Name[zu]=Isi-Lingala [lo] Name=Lao -Name[ar]=لاويه -Name[az]=Laoca -Name[be]=ЛаоÑÐºÐ°Ñ -Name[bg]=ЛаоÑки -Name[bn]=লাও -Name[ca]=Laosià -Name[cs]=Laoský -Name[csb]=LaòtaÅ„sczi -Name[de]=Laotisch -Name[eo]=LaÅa -Name[es]=Laosiano -Name[eu]=Laosera -Name[fa]=لائویی -Name[ga]=Láóis -Name[he]=ל×ו -Name[hi]=लाओ -Name[hsb]=Laotisce -Name[ja]=ラオ語 -Name[ka]=ლáƒáƒ -Name[kk]=ЛаоÑша -Name[km]=ឡាវ -Name[ko]=ë¼ì˜¤ì–´ -Name[lt]=LaosieÄių -Name[lv]=LaosieÅ¡u -Name[mk]=Лао -Name[mn]=Лао -Name[nds]=Laootsch -Name[ne]=लाओ -Name[nso]=Se-Lao -Name[pa]=ਲਿਓ -Name[pl]=LaotaÅ„ski -Name[ru]=Лао -Name[rw]=Ikilawo -Name[se]=Laogiella -Name[sk]=laoÅ¡tina -Name[sl]=laoÅ¡ko -Name[sq]=Laisht -Name[sr]=Лао -Name[ss]=Si-Lao -Name[sv]=Laotiska -Name[ta]=லாவோ -Name[te]=లావో -Name[tg]=ЛаоÑÓ£ -Name[th]=ภาษาลาว -Name[tt]=Laoça -Name[uk]=ЛаоÑька -Name[uz]=Laoscha -Name[uz@cyrillic]=ЛаоÑча -Name[vi]=Là o -Name[wa]=Lawocyin -Name[zh_CN]=è€æŒè¯ -Name[zh_HK]=寮國語 -Name[zh_TW]=寮國語 -Name[zu]=Isi-Lao [lt] Name=Lithuanian -Name[af]=Lithuaniese -Name[ar]=الليتوانية -Name[az]=Litovca -Name[be]=ЛітоўÑÐºÐ°Ñ -Name[bg]=ЛитовÑки -Name[bn]=লিথà§à§Ÿà§‡à¦¨à§€à§Ÿ -Name[br]=Lituaneg -Name[bs]=Litvanski -Name[ca]=Lituà -Name[cs]=Litevský -Name[csb]=Litewsczi -Name[cy]=Lithuaneg -Name[da]=Litauisk -Name[de]=Litauisch -Name[el]=Λιθουανικά -Name[eo]=Litova -Name[es]=Lituano -Name[et]=Leedu -Name[eu]=Lituaniera -Name[fa]=لیتوانی -Name[fi]=Liettua -Name[fr]=Lituanien -Name[fy]=Litouwsk -Name[ga]=Liotuáinis -Name[gl]=Lituano -Name[he]=ליט×ית -Name[hi]=लिथà¥à¤†à¤¨à¤¿à¤¯à¤¨ -Name[hr]=Litvanski -Name[hsb]=Litawsce -Name[hu]=Litván -Name[id]=Lithuania -Name[is]=LitháÃska -Name[it]=Lituano -Name[ja]=リトアニア語 -Name[ka]=ლიტვური -Name[kk]=Литваша -Name[km]=លីទុយអានី -Name[ko]=리투아니아어 -Name[lb]=Litauesch -Name[lt]=Lietuvių -Name[lv]=LietuvieÅ¡u -Name[mk]=ЛитванÑки -Name[mn]=Литви -Name[ms]=Lithuania -Name[mt]=Litwanjan -Name[nb]=Litauisk -Name[nds]=Litausch -Name[ne]=लिथà¥à¤¨à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Litouws -Name[nn]=Litauisk -Name[nso]=Se-Lithuanian -Name[oc]=Litua -Name[pa]=ਲੀਥੂਨੀਆਨ -Name[pl]=Litewski -Name[pt]=Lituano -Name[pt_BR]=Lituano -Name[ro]=Lituaniană -Name[ru]=ЛитовÑкий -Name[rw]=Ikinyalitwani -Name[se]=Lietuvagiella -Name[sk]=litovÄina -Name[sl]=litvansko -Name[sq]=Lituanisht -Name[sr]=ЛитванÑки -Name[sr@Latn]=Litvanski -Name[ss]=Si-Lithuanian -Name[sv]=Litauiska -Name[ta]=லிதà¯à®µà¯‡à®©à®¿à®¯à®©à¯ -Name[te]=లితà±à°µà±†à°¨à°¿à°¯à°¨à± -Name[tg]=Литвонӣ -Name[th]=ภาษาลิธัวเนีย -Name[tr]=Litvanya Dili -Name[tt]=Litçä -Name[uk]=ЛитовÑька -Name[uz]=Litvacha -Name[uz@cyrillic]=Литвача -Name[vi]=Li-tu-a-ni -Name[wa]=Litwanyin -Name[zh_CN]=ç«‹é™¶å®›è¯ -Name[zh_HK]=立陶宛語 -Name[zh_TW]=立陶宛語 -Name[zu]=Isi-Lithuanian [lv] Name=Latvian -Name[ar]=اللاتÙية -Name[az]=Latışca -Name[be]=ЛатвійÑÐºÐ°Ñ -Name[bg]=ЛатвийÑки -Name[bn]=লাটà¦à¦¿à§Ÿà¦¾à¦¨ -Name[br]=Latvieg -Name[bs]=Latvijski -Name[ca]=Letó -Name[cs]=LotyÅ¡ský -Name[csb]=Åotewsczi -Name[cy]=Latfieg -Name[da]=Lettisk -Name[de]=Lettisch -Name[el]=Λεττονικά -Name[eo]=Latvia -Name[es]=Latvio -Name[et]=Läti -Name[eu]=Letoniera -Name[fa]=لاتوینی -Name[fi]=Latvia -Name[fr]=Letton -Name[fy]=Letsk -Name[ga]=Laitvis -Name[gl]=Letón -Name[he]=לטבית -Name[hi]=लाटवियन -Name[hr]=Latvijski -Name[hsb]=Letisce -Name[hu]=Lett -Name[id]=Latvia -Name[is]=Lettneska -Name[it]=Lettone -Name[ja]=ラトビア語 -Name[ka]=ლáƒáƒ¢áƒ•áƒ˜áƒ£áƒ ი -Name[kk]=ЛатвиÑша -Name[km]=ឡាážážœáž¸áž™áŸ‰áž¶ -Name[ko]=ë¼íŠ¸ë¹„ì•„ì–´ -Name[lb]=Lettesch -Name[lt]=Latvių -Name[lv]=LatvieÅ¡u -Name[mk]=ЛатвиÑки -Name[mn]=Латви -Name[ms]=Latvia -Name[mt]=Latvjan -Name[nb]=Latvisk -Name[nds]=Lettsch -Name[ne]=लाटà¥à¤à¤¿à¤¯à¤¨ -Name[nl]=Lets -Name[nn]=Latvisk -Name[nso]=Se-Latvian -Name[pa]=ਲਾਟਵੀਨ -Name[pl]=Åotewski -Name[pt]=Letão -Name[pt_BR]=Latvia -Name[ro]=Latviană -Name[ru]=ЛатышÑкий -Name[rw]=Ikilativiya -Name[se]=Látviagiella -Name[sk]=lotyÅ¡tina -Name[sl]=latvijsko -Name[sq]=Latvisht -Name[sr]=ЛатвијÑки -Name[sr@Latn]=Latvijski -Name[ss]=Si-Latvian -Name[sv]=Lettiska -Name[ta]=இலடà¯à®µà®¿à®¯à®©à¯ -Name[te]=లాటివà±à°¯à°¨à± -Name[tg]=ЛатвиÑгӣ -Name[th]=ภาษาลัทเวีย -Name[tr]=Litvanya Dili -Name[tt]=Latça -Name[uk]=ЛатвійÑька -Name[uz]=Latishcha -Name[uz@cyrillic]=Латишча -Name[vi]=Lát-vi-a -Name[wa]=Letonyin -Name[xh]=Isilatvian -Name[zh_CN]=æ‹‰è„±ç»´äºšè¯ -Name[zh_HK]=拉脫ç¶äºžèªž -Name[zh_TW]=拉脫ç¶äºžèªž -Name[zu]=Isi-Latvian [mg] Name=Malagasy -Name[az]=MalaqasicÉ™ -Name[be]=МалагаÑійÑÐºÐ°Ñ -Name[bg]=Малагашки -Name[bn]=মালাগাসি -Name[br]=Malagacheg -Name[ca]=Malgaix -Name[csb]=Madagarsczi -Name[de]=Madagassisch -Name[el]=Μαλγασικά -Name[eo]=Malagasa -Name[es]=Malagasio -Name[et]=Malagassi -Name[eu]=Madagaskarera -Name[fa]=مالاگازی -Name[fi]=Malagasi -Name[fr]=Malgache -Name[fy]=Malagasysk -Name[ga]=Malagásais -Name[gl]=Kanu -Name[he]=מלגשית -Name[hi]=मलागासी -Name[hr]=Malagaski -Name[hu]=Malagazi -Name[id]=Malagasi -Name[it]=Malgascio -Name[ja]=マラガシ語 -Name[ka]=მáƒáƒšáƒáƒ’áƒáƒ¡áƒ£áƒ ი -Name[kk]=Мальгашша -Name[km]=ម៉ាដាហ្កាសការ -Name[ko]=ë§ë¼ê°€ì‹œì–´ -Name[lb]=Madagassesch -Name[lt]=Malagasių -Name[lv]=Malagasu -Name[mk]=МалагаÑи -Name[mn]=МалагаÑу -Name[nds]=Madagass'sch -Name[ne]=मालागासे -Name[nn]=Gassisk -Name[nso]=Se-Malagasy -Name[pa]=ਮਾਲਾਗਾਸਆ -Name[pl]=Madagaskarski -Name[pt]=Malgaxe -Name[ro]=Malgaşă -Name[ru]=МальгашÑкий -Name[rw]=Ikimaragasi -Name[se]=Malagasigiella -Name[sk]=malgaÅ¡tina -Name[sl]=malagaÅ¡ko -Name[sq]=Malagasisht -Name[sr]=МалагаÑки -Name[sr@Latn]=Malagaski -Name[ss]=Si-Malagasy -Name[sv]=Malagassiska -Name[ta]=மலகாசி -Name[te]=మలగాసి -Name[tg]=МалагаÑÓ£ -Name[th]=ภาษามาลาà¸à¸²à¸‹à¸µ -Name[tt]=Malagasça -Name[uk]=МалайÑька -Name[uz]=Malagasi -Name[uz@cyrillic]=МалагаÑи -Name[vi]=Ma-la-ga-xị -Name[wa]=Malgache -Name[zh_CN]=é©¬å°”åŠ ä»€è¯ -Name[zh_HK]=é¦¬æ‹‰åŠ è¥¿èªž -Name[zh_TW]=é¦¬æ‹‰åŠ è¥¿èªž -Name[zu]=Isi-Malagasy [mh] Name=Marshallese -Name[ar]=المارشالية -Name[az]=MarÅŸallca -Name[be]=МаршальÑÐºÐ°Ñ -Name[bg]=Ебон -Name[bn]=মারà§à¦¶à¦¾à¦²à¦¿à¦¸ -Name[br]=Yezh an enez Marshall -Name[bs]=MarÅ¡alski -Name[ca]=Marshallès -Name[cs]=Marshallský -Name[csb]=z Ã’strowów Marshalla -Name[cy]=Marshalleg -Name[da]=Marshallesisk -Name[de]=Marshallisch -Name[eo]=MarÅala -Name[es]=Marshalés -Name[et]=MarÅ¡alli -Name[eu]=Marshallera -Name[fa]=مارشالی -Name[fi]=Marshall -Name[fr]=Marshall -Name[fy]=Marshalleesk -Name[ga]=Marascailis -Name[gl]=Marshalés -Name[he]=מרשלית -Name[hi]=मारà¥à¤¶à¤²à¥€à¤¸ -Name[hr]=MarÅ¡aleski -Name[hsb]=MarÅ¡alezisce -Name[hu]=Marsalli -Name[is]=Maltneska -Name[it]=Marshall, lingua delle isole -Name[ja]=マーシャル語 -Name[ka]=მáƒáƒ შáƒáƒšáƒ£áƒ ი -Name[kk]=Маршаллша -Name[km]=ម៉ាស្យលីស -Name[lb]=Marschallesesch -Name[lt]=MarÅ¡alieÄių -Name[lv]=MarÅ¡alieÅ¡u -Name[mk]=МаршалÑки -Name[mn]=Маршалл -Name[nb]=Marshallesisk -Name[nds]=Marschalleesch -Name[ne]=मारà¥à¤¶à¤¾à¤²à¤¿à¤¶ -Name[nl]=Marshallees -Name[nn]=Marshallesisk -Name[nso]=Se-Marshallese -Name[pa]=ਮਾਰਸ਼ਲੀਈਸੀ -Name[pl]=z Wysp Marshalla -Name[pt]=Marselhês -Name[ro]=MarÅŸaleză -Name[ru]=МаршалльÑкий -Name[rw]=Ikimarishali -Name[se]=Marshallagiella -Name[sk]=marÅ¡alÄina -Name[sl]=marÅ¡alsko -Name[sq]=Marshalisht -Name[sr]=МаршалеÑки -Name[sr@Latn]=MarÅ¡aleski -Name[ss]=Si-Marshallese -Name[sv]=Marshall -Name[ta]=மாரà¯à®·à®²à¯€à®¸à¯ -Name[te]=మారà±à°·à°²à±€à°¸à± -Name[tg]=Маршалезӣ -Name[th]=ภาษามาร์à¹à¸Šà¸¥à¸¥à¸µà¸ª -Name[tt]=MarÅŸallça -Name[uk]=МаршальÑька -Name[uz]=Marshallez -Name[uz@cyrillic]=Маршаллез -Name[vi]=Mă-xăn -Name[wa]=Marshalès -Name[zh_CN]=马ç»å°”è¯ -Name[zh_HK]=馬紹爾語 -Name[zh_TW]=馬紹爾語 -Name[zu]=Isi-Marshallese [mi] Name=Maori -Name[ar]=الموري -Name[az]=MaoricÉ™ -Name[be]=МаорÑÐºÐ°Ñ -Name[bg]=Маори -Name[bn]=মাওরি -Name[br]=Maorieg -Name[bs]=Maorski -Name[cs]=Maorský -Name[csb]=Maòrëjsczi -Name[el]=ΜαοÏί -Name[eo]=Maoria -Name[es]=Maorà -Name[et]=Maoori -Name[eu]=Maoria -Name[fa]=مائوری -Name[ga]=Maorais -Name[he]=מ×ורית -Name[hi]=माओरी -Name[hsb]=Maorisce -Name[ja]=マオリ語 -Name[ka]=მáƒáƒáƒ ი -Name[kk]=Маори -Name[km]=ម៉ោរី -Name[ko]=마오리어 -Name[lb]=Maoresch -Name[lt]=Maorių -Name[lv]=Maoru -Name[mi]=Reo Mäori -Name[mk]=МаорÑки -Name[mn]=Маори -Name[ne]=माओरी -Name[nso]=Se-Maori -Name[oc]=Maòri -Name[pa]=ਮਾਓਰੀ -Name[pl]=Maoryjski -Name[ro]=Maură -Name[ru]=Маори -Name[rw]=Ikimawori -Name[se]=Maoragiella -Name[sk]=maorÄina -Name[sl]=maorsko -Name[sq]=Maorisht -Name[sr]=МаорÑки -Name[sr@Latn]=Maorski -Name[ss]=Si-Maori -Name[sv]=Maoriska -Name[ta]=மாவோரி -Name[te]=మావొరి -Name[tg]=Маори -Name[th]=ภาษาเมารี -Name[tr]=Maori Dili -Name[tt]=Maoriça -Name[uk]=Маорі -Name[uz@cyrillic]=Маори -Name[vi]=Mao-ri -Name[wa]=Mawori -Name[zh_CN]=æ¯›åˆ©è¯ -Name[zh_HK]=毛利語 -Name[zh_TW]=毛利語 -Name[zu]=Isi-Maori [mk] Name=Macedonian -Name[ar]=المقدونية -Name[az]=Makedonca -Name[be]=МакедонÑÐºÐ°Ñ -Name[bg]=МакедонÑки -Name[bn]=মাসিডোনীয় -Name[br]=Makedoneg -Name[bs]=Makedonski -Name[ca]=Macedoni -Name[cs]=Makedonský -Name[csb]=MacedoÅ„sczi -Name[cy]=Macedoneg -Name[da]=Makedonisk -Name[de]=Mazedonisch -Name[el]=Σλαβομακεδονικά -Name[eo]=Macedonia -Name[es]=Macedonio -Name[et]=Makedoonia -Name[eu]=Mazedoniera -Name[fa]=مقدونی -Name[fi]=Makedonia -Name[fr]=Macédonien -Name[fy]=Masedoanysk -Name[ga]=Macadóinis -Name[gl]=Macedónio -Name[he]=×ž×§×“×•× ×™×ª -Name[hi]=मकदूनियन -Name[hr]=Makedonski -Name[hsb]=Makedonsce -Name[hu]=Macedón -Name[id]=Masedonian -Name[is]=MakedónÃska -Name[it]=Macedone -Name[ja]=マケドニア語 -Name[ka]=მáƒáƒ™áƒ”დáƒáƒœáƒ£áƒ ი -Name[kk]=Македонша -Name[km]=ម៉ាសáŸážŠáž¼áž“ី -Name[ko]=마케ë„니아어 -Name[lb]=Mazedonesch -Name[lt]=MakedonieÄių -Name[lv]=MaÄ·edonieÅ¡u -Name[mi]=Reo Makerönia -Name[mk]=МакедонÑки -Name[mn]=Макидон -Name[ms]=Macedonia -Name[mt]=MaÄ‹edonjan -Name[nb]=Makedonsk -Name[nds]=Makedoonsch -Name[ne]=मà¥à¤¯à¤¾à¤¸à¥‡à¤¡à¥‹à¤¨à¤¿à¤¯à¤¨ -Name[nl]=Macedonisch -Name[nn]=Makedonsk -Name[nso]=Se-Macedonian -Name[pa]=ਮੈਕਡੋਨੀਆ -Name[pl]=MacedoÅ„ski -Name[pt]=Macedónio -Name[pt_BR]=Macedoniano -Name[ro]=Macedoneană -Name[ru]=МакедонÑкий -Name[rw]=Ikinyamacedoniya -Name[se]=Makedoniagiella -Name[sk]=macedónÄina -Name[sl]=makedonsko -Name[sq]=SllavoMaqedonisht -Name[sr]=МакедонÑки -Name[sr@Latn]=Makedonski -Name[ss]=Si-Macedonian -Name[sv]=Makedonska -Name[ta]=மாசிடோனியன௠-Name[te]=మసిడొనియనౠ-Name[tg]=Мақдунӣ -Name[th]=ภาษามาเซโดเนีย -Name[tr]=Makedonca -Name[tt]=Makedonça -Name[uk]=МакедонÑька -Name[uz]=Makedoniyacha -Name[uz@cyrillic]=МакедониÑча -Name[vi]=Ma-xê-đô-ni -Name[wa]=Macedonyin -Name[zh_CN]=é©¬å…¶é¡¿è¯ -Name[zh_HK]=é¦¬å…¶é “èªž -Name[zh_TW]=é¦¬å…¶é “èªž -Name[zu]=Isi-Makhedoniya [ml] Name=Malayalam -Name[ar]=المالايالام -Name[az]=Malayamca -Name[be]=МалаÑламÑÐºÐ°Ñ -Name[bg]=МалаÑлам -Name[bn]=মালয়লম -Name[csb]=DrawidaÅ„sczi (hindusczi) -Name[eo]=Malajalama -Name[es]=Malayo -Name[et]=Malajalami -Name[fa]=مالی -Name[fi]=Malajalam -Name[ga]=Mailéalaimis -Name[gl]=Malaialam -Name[he]=מלי×ל×× -Name[hi]=मलयालम -Name[hr]=Malajamski -Name[hu]=Malajalam -Name[it]=Kerala, lingua del -Name[ja]=マラヤーラム語 -Name[ka]=მáƒáƒšáƒáƒ˜áƒšáƒáƒ›áƒ˜ -Name[kk]=Малайамша -Name[km]=ម៉ាឡាយ៉ាឡាម -Name[lb]=Malajalam -Name[lt]=MalajieÄių -Name[mk]=Малајалам -Name[mn]=МалаÑлам -Name[ne]=मलायालम -Name[nso]=Se-Malayalam -Name[pa]=ਮਲਿਆਲਮ -Name[pl]=DrawidiaÅ„ski (Hinduski) -Name[ro]=Malailamă -Name[ru]=МалайÑлам -Name[rw]=Ikimalayalamu -Name[se]=Malajalamagiella -Name[sk]=malajálamÄina -Name[sl]=malayalam -Name[sq]=Malajamisht -Name[sr]=МалајамÑки -Name[sr@Latn]=Malajamski -Name[ss]=Si-Malayalam -Name[ta]=மலையாளம௠-Name[te]=మలయాళం -Name[tg]=МалаÑмӣ -Name[th]=ภาษามะละยาลัง -Name[uk]=МалайÑька -Name[uz@cyrillic]=Малайалам -Name[vi]=Ma-lay-am -Name[zh_CN]=德拉维æ—è¯ -Name[zh_HK]=馬來亞拉姆語 -Name[zh_TW]=馬來亞拉姆語 -Name[zu]=Isi-Malayalam [mn] Name=Mongolian -Name[af]=Mongolees -Name[ar]=منغولية -Name[az]=Monqolca -Name[be]=МангольÑÐºÐ°Ñ -Name[bg]=МонголÑки -Name[bn]=মোঙà§à¦—ল -Name[br]=Mongolieg -Name[bs]=Mongolski -Name[ca]=Mongol -Name[cs]=Mongolský -Name[csb]=Mòngolsczi -Name[cy]=Mongoleg -Name[da]=Mongolsk -Name[de]=Mongolisch -Name[el]=Μογγολικά -Name[eo]=Mongola -Name[es]=Mongol -Name[et]=Mongoolia -Name[eu]=Mongoliera -Name[fa]=مغول -Name[fi]=Mongoli -Name[fr]=Mongol -Name[fy]=Moangoalsk -Name[ga]=Mongóilis -Name[gl]=Mongol -Name[he]=×ž×•× ×’×•×œ×™×ª -Name[hi]=मंगोलियन -Name[hr]=Mongolski -Name[hsb]=Mongolsce -Name[hu]=Mongol -Name[id]=Mongolia -Name[is]=BosnÃska -Name[it]=Mongolo -Name[ja]=モンゴル語 -Name[ka]=მáƒáƒœáƒ¦áƒáƒšáƒ£áƒ ი -Name[kk]=Моңғолша -Name[km]=ម៉ុងហ្គោលី -Name[ko]=몽골어 -Name[ku]=Mongolî -Name[lb]=Mongolesch -Name[lt]=Mongolų -Name[lv]=Mongoļu -Name[mk]=МонголÑки -Name[mn]=Монгол -Name[ms]=Mongolia -Name[nb]=Mongolsk -Name[nds]=Mongoolsch -Name[ne]=मङà¥à¤—ोलियाली -Name[nl]=Mongolisch -Name[nn]=Mongolsk -Name[nso]=Se-Mongolian -Name[pa]=ਮੰਗੋਲੀਅਨ -Name[pl]=Mongolski -Name[pt]=Mongol -Name[pt_BR]=Mongolês -Name[ro]=Mongolă -Name[ru]=МонгольÑкий -Name[rw]=Ikinyamongoliya -Name[se]=Mongoliagiella -Name[sk]=mongolÄina -Name[sl]=mongolsko -Name[sq]=Mongolisht -Name[sr]=МонголÑки -Name[sr@Latn]=Mongolski -Name[ss]=Si-Mongolian -Name[sv]=Mongoliska -Name[ta]=மொஙà¯à®•à¯‹à®²à®¿à®¯à®©à¯ -Name[te]=మంగోలియనౠ-Name[tg]=Муғулӣ -Name[th]=ภาษามà¸à¸‡à¹‚à¸à¸¥ -Name[tr]=Mongolca -Name[tt]=MoÄŸolça -Name[uk]=МонгольÑька -Name[uz]=MugÊ»ulcha -Name[uz@cyrillic]=Муғулча -Name[vi]=Mông-cổ -Name[wa]=Mongol -Name[zh_CN]=è’™å¤è¯ -Name[zh_HK]=è’™å¤èªž -Name[zh_TW]=è’™å¤èªž -Name[zu]=Isi-Mongolian [mo] Name=Moldavian -Name[ar]=مولدوÙية -Name[az]=Moldavca -Name[be]=МалдаўÑÐºÐ°Ñ -Name[bg]=МолдовÑки -Name[bn]=মলডেà¦à§€à§Ÿ -Name[br]=Moldaveg -Name[bs]=Moldavski -Name[ca]=Moldau -Name[cs]=Moldavský -Name[csb]=Mòłdawsczi -Name[cy]=Moldafeg -Name[da]=Moldovisk -Name[de]=Moldawisch -Name[el]=Μολδαβικά -Name[eo]=Moldava -Name[es]=Moldavo -Name[et]=Moldaavia -Name[eu]=Moldabiera -Name[fa]=مولداوی -Name[fi]=Moldavia -Name[fr]=Moldave -Name[fy]=Moldavysk -Name[ga]=Moldávais -Name[gl]=Moldavo -Name[he]=מולדבית -Name[hi]=मोलà¥à¤¦à¤¾à¤µà¤¿à¤¯à¤¨ -Name[hr]=Moldavski -Name[hsb]=Moldawisce -Name[hu]=Moldáv -Name[id]=Moldavia -Name[is]=MoldóvÃska -Name[it]=Moldavo -Name[ja]=モルダビア語 -Name[ka]=მáƒáƒšáƒ“áƒáƒ•áƒ£áƒ ი -Name[kk]=Молдовша -Name[km]=ម៉ុលដាវី -Name[ko]=몰다비어 -Name[lb]=Moldawesch -Name[lt]=Moldavų -Name[lv]=MoldÄvu -Name[mk]=МолдавÑки -Name[mn]=Молдав -Name[ms]=Moldavia -Name[nb]=Moldavisk -Name[nds]=Moldaawsch -Name[ne]=मोलà¥à¤¡à¤¾à¤à¤¿à¤¯à¤¨ -Name[nl]=Moldavisch -Name[nn]=Moldovsk -Name[nso]=Se-Moldavian -Name[pa]=ਮੋਲਡਾਵੀਅਨ -Name[pl]=MoÅ‚dawski -Name[pt]=Moldavo -Name[pt_BR]=Moldaviano -Name[ro]=Moldovenească -Name[ru]=МолдавÑкий -Name[rw]=Ikinyamoludavi -Name[se]=Moldáviagiella -Name[sk]=moldavÄina -Name[sl]=moldavsko -Name[sq]=Moldavisht -Name[sr]=МолдавÑки -Name[sr@Latn]=Moldavski -Name[ss]=Si-Moldavian -Name[sv]=Moldaviska -Name[ta]=மோலà¯à®Ÿà¯‹à®µà®¿à®¯à®©à¯ -Name[te]=మొలà±à°¦à°¾à°µà°¿à°¯à°¨à± -Name[tg]=Молдаванӣ -Name[th]=ภาษามà¸à¸¥à¸”าเวียน -Name[tr]=Moldavaca -Name[tt]=Moldavça -Name[uk]=МолдовÑька -Name[uz]=Moldavcha -Name[uz@cyrillic]=Молдавча -Name[vi]=Mon-Ä‘a-vi -Name[wa]=MoldÃ¥ve -Name[zh_CN]=摩尔多瓦 -Name[zh_HK]=摩爾é”ç¶äºžèªž -Name[zh_TW]=摩爾é”ç¶äºžèªž -Name[zu]=Isi-Moldavian [mr] Name=Marathi -Name[ar]=الماراثي -Name[az]=MaraticÉ™ -Name[be]=МараўÑÐºÐ°Ñ -Name[bg]=Маратхи -Name[bn]=মরাঠী -Name[br]=Marateg -Name[csb]=Marathi (hindusczi) -Name[eo]=Marata -Name[es]=Maratà -Name[eu]=Marathera -Name[fa]=ماراتی -Name[fr]=Marathe -Name[ga]=Maraitis -Name[gl]=Marata -Name[he]=מ×ר×תי -Name[hi]=मराठी -Name[hsb]=Marati -Name[hu]=Marati -Name[ja]=マラーティー語 -Name[ka]=მáƒáƒ áƒáƒ—ი -Name[kk]=Марати -Name[km]=ម៉ារាធី -Name[ko]=마ë¼í‹°ì–´ -Name[lv]=Maratu -Name[mk]=Марати -Name[mn]=Марати -Name[ne]=मराठी -Name[nso]=Se-Marathi -Name[pa]=ਮਰਾਠੀ -Name[pl]=Marathi (Hinduski) -Name[ru]=Марати -Name[rw]=Ikimarati -Name[se]=Marathagiella -Name[sk]=maráthÄina -Name[sl]=marathi -Name[sq]=Maratisht -Name[sr]=МаратÑки -Name[sr@Latn]=Maratski -Name[ss]=Si-Marathi -Name[ta]=மராதà¯à®¤à®¿ -Name[te]=మరాఠి -Name[tg]=Маравӣ -Name[th]=ภาษามราà¸à¸µ -Name[tt]=Maratça -Name[uk]=Мараті -Name[uz]=Marati -Name[uz@cyrillic]=Марати -Name[vi]=Ma-ra-ti -Name[wa]=Marati -Name[zh_CN]=é©¬æ‹‰åœ°è¯ -Name[zh_HK]=馬拉地語 -Name[zh_TW]=馬拉地語 -Name[zu]=Isi-Marathi [ms] Name=Malay -Name[ar]=مالاوية -Name[az]=Malayca -Name[be]=МалайÑÐºÐ°Ñ -Name[bg]=МалайÑки -Name[bn]=মালয় -Name[br]=Maya -Name[bs]=Malajski -Name[ca]=Malai -Name[cs]=Malajský -Name[csb]=Malajsczi -Name[de]=Malaiisch -Name[eo]=Malaja -Name[es]=Malayo -Name[et]=Malaisia -Name[eu]=Malaysiera -Name[fa]=مالی -Name[fi]=Malaiji -Name[fr]=Malais -Name[fy]=Maleisk -Name[ga]=Malaeis -Name[gl]=Malaio -Name[he]=מל×ית -Name[hi]=मलय -Name[hr]=Malajski -Name[hsb]=Malajsce -Name[hu]=Maláj -Name[id]=Melayu -Name[it]=Malese -Name[ja]=マレー語 -Name[ka]=მáƒáƒšáƒáƒ£áƒ ი -Name[kk]=Малайша -Name[km]=ម៉ាឡáŸážŸáŸŠáž¸ -Name[ko]=ë§ë ˆì´ì–´ -Name[ku]=Malayî -Name[lb]=Malaiesch -Name[lt]=Malajų -Name[lv]=MalajieÅ¡u -Name[mk]=МалајÑки -Name[mn]=ÐœÐ°Ð»Ñ -Name[nb]=Malaiisk -Name[nds]=Malaiisch -Name[ne]=मले -Name[nn]=Malayisk -Name[nso]=Se-Malay -Name[pa]=ਮਾਲਿਆ -Name[pl]=Malajski -Name[pt]=Malaio -Name[pt_BR]=Malaiano -Name[ro]=Malaeză -Name[ru]=МалайÑкий -Name[rw]=Ikimalayi -Name[se]=Malaigiella -Name[sk]=malajÄina -Name[sl]=malajsko -Name[sq]=Malanisht -Name[sr]=МалајÑки -Name[sr@Latn]=Malajski -Name[ss]=Si-Malay -Name[sv]=Malajiska -Name[ta]=மலாய௠-Name[te]=మలయ -Name[tg]=Малайӣ -Name[th]=ภาษามาเลย์ -Name[tt]=Malayça -Name[uk]=МалайÑька -Name[uz]=Malaycha -Name[uz@cyrillic]=Малайча -Name[vi]=Mã-lai -Name[zh_CN]=马æ¥è¥¿äºšè¯ -Name[zh_HK]=馬來語 -Name[zh_TW]=馬來語 -Name[zu]=Isi-Malay [mt] Name=Maltese -Name[af]=Maltees -Name[ar]=المالطية -Name[az]=Maltaca -Name[be]=МальтыйÑÐºÐ°Ñ -Name[bg]=МалтийÑки -Name[bn]=মলà§à¦Ÿà¦¿à¦¸ -Name[br]=Malteg -Name[bs]=MalteÅ¡ki -Name[ca]=Maltès -Name[cs]=Maltézský -Name[csb]=Maltajsczi -Name[cy]=Malteg -Name[da]=Maltesisk -Name[de]=Maltesisch -Name[el]=ΜαλτÎζικα -Name[eo]=Malta -Name[es]=Maltés -Name[et]=Malta -Name[eu]=Maltera -Name[fa]=مالتز -Name[fi]=Malta -Name[fr]=Maltais -Name[fy]=Malteesk -Name[ga]=Máltais -Name[gl]=Maltés -Name[he]=מלטזית -Name[hi]=मालà¥à¤Ÿà¥€à¤¸ -Name[hr]=MalteÅ¡ki -Name[hsb]=Maltisce -Name[hu]=Máltai -Name[id]=Malta -Name[is]=Maltneska -Name[ja]=マルタ語 -Name[ka]=მáƒáƒšáƒ¢áƒ£áƒ ი -Name[kk]=Мальташа -Name[km]=ម៉ាល់ážáž¶ -Name[ko]=몰타어 -Name[ku]=Maltayî -Name[lb]=Maltesesch -Name[lt]=MaltieÄių -Name[lv]=MaltieÅ¡u -Name[mk]=Малтешки -Name[mn]=Малт -Name[mt]=Malti -Name[nb]=Maltesisk -Name[nds]=Malteesch -Name[ne]=मालà¥à¤¤à¥‡à¤¸à¥€ -Name[nl]=Maltees -Name[nn]=Maltesisk -Name[nso]=Se-Maltese -Name[pa]=ਮਾਲਟੀਸੀ -Name[pl]=MaltaÅ„ski -Name[pt]=Maltês -Name[pt_BR]=Maltês -Name[ro]=Malteză -Name[ru]=МальтийÑкий -Name[rw]=Ikinyamalite -Name[se]=Maltagiella -Name[sk]=maltÄina -Name[sl]=maltežansko -Name[sq]=Maltezisht -Name[sr]=Малтешки -Name[sr@Latn]=MalteÅ¡ki -Name[ss]=Si-Maltese -Name[sv]=Maltesiska -Name[ta]=மாலà¯à®Ÿà¯€à®šà®¿à®¯ -Name[te]=మాలà±à°Ÿà±€à°¸à± -Name[tg]=МалтеÑÓ£ -Name[th]=ภาษามà¸à¸¥à¸•à¸µà¸ª -Name[tr]=Malta Dili -Name[tt]=Maltesçä -Name[uk]=МальтійÑька -Name[uz]=Maltacha -Name[uz@cyrillic]=Малтача -Name[vi]=Man-tợ -Name[wa]=Maltès -Name[zh_CN]=é©¬è€³ä»–è¯ -Name[zh_HK]=馬爾他語 -Name[zh_TW]=馬爾他語 -Name[zu]=Isi-Maltase [my] Name=Burmese -Name[af]=Burmees -Name[ar]=بورمي -Name[az]=Burmaca -Name[be]=БурмеÑÐºÐ°Ñ -Name[bg]=БирманÑки -Name[bn]=বরà§à¦®à§€ -Name[br]=Birmaneg -Name[bs]=Burmanski -Name[ca]=Burmès -Name[cs]=Burmský -Name[csb]=BirmaÅ„sczi -Name[cy]=Burmeg -Name[de]=Burmesisch -Name[el]=ΒιÏμανικά -Name[eo]=Birma -Name[es]=Burmés -Name[et]=Birma -Name[eu]=Birmaniera -Name[fa]=برمس -Name[fi]=Burma -Name[fr]=Birman -Name[fy]=Burmeesk -Name[ga]=Burmais -Name[gl]=Burmés -Name[he]=בורמזית -Name[hi]=बरà¥à¤®à¥€à¤¸ -Name[hr]=Burmanski -Name[hsb]=Burmezisce -Name[hu]=Burmai -Name[id]=Burma -Name[is]=Búrmenska -Name[it]=Birmano -Name[ja]=ビルマ語 -Name[ka]=ბირმული -Name[kk]=Бирманша -Name[km]=ភូមា -Name[ko]=버마어 -Name[lb]=Burmesesch -Name[lt]=BirmieÄių -Name[lv]=BirmieÅ¡u -Name[mk]=БурманÑки -Name[mn]=Бүрм -Name[ms]=Burma -Name[nb]=Burmesisk -Name[nds]=Burmeesch -Name[ne]=बरà¥à¤®à¥‡à¤²à¥€ -Name[nl]=Burmees -Name[nn]=Burmesisk -Name[nso]=Se-Burmese -Name[pa]=ਬà©à¨°à¨®à©€à¨¸à©€ -Name[pl]=BirmaÅ„ski -Name[pt]=Birmanês -Name[ro]=Burmeză -Name[ru]=БирманÑкий -Name[rw]=Ikibarumi -Name[se]=Burmagiella -Name[sk]=barmÄina -Name[sl]=burmansko -Name[sq]=Burmesisht -Name[sr]=БурманÑки -Name[sr@Latn]=Burmanski -Name[ss]=Si-Burmese -Name[sv]=Burmesiska -Name[ta]=பரà¯à®®à®¿à®¯ -Name[te]=బరà±à°®à±€à°¸à± -Name[tg]=Бурмезӣ -Name[th]=ภาษาพม่า -Name[tt]=Burmesçä -Name[uk]=БірманÑька -Name[uz]=Burmezcha -Name[uz@cyrillic]=Бурмезча -Name[vi]=Miến-Ä‘iện -Name[zh_CN]=ç¼…ç”¸è¯ -Name[zh_HK]=緬甸語 -Name[zh_TW]=緬甸語 -Name[zu]=Isi-Burmese [na] Name=Nauru -Name[ar]=الناورو -Name[az]=Nauruca -Name[be]=ÐаурÑкі -Name[bg]=Ðауру -Name[bn]=নাউরৠ-Name[br]=Naurueg -Name[de]=Nauruisch -Name[el]=ÎαουÏÎ¿Ï -Name[eo]=Naura -Name[eu]=Nauruera -Name[fa]=نائورو -Name[fr]=Nauruan -Name[fy]=Naurûaansk -Name[ga]=Nárúis -Name[he]=× ×ורו -Name[hi]=नौरू -Name[ja]=ナウル語 -Name[ka]=ნáƒáƒ£áƒ უ -Name[kk]=Ðауру -Name[km]=ណូរុ -Name[ko]=나우루 -Name[lb]=Nauruesch -Name[mk]=Ðауру -Name[mn]=Ðауру -Name[ne]=नाउरू -Name[nso]=Se-Nauru -Name[pa]=ਨਾਉਰੂ -Name[ro]=Naură -Name[ru]=Ðауру -Name[rw]=Ikinawuru -Name[se]=Naurugiella -Name[sk]=nauruÅ¡tina -Name[sl]=nauru -Name[sq]=Naurisht -Name[sr]=ÐаурÑки -Name[sr@Latn]=Naurski -Name[ss]=Si-Nauru -Name[ta]=நவà¯à®°à¯ -Name[te]=నౌరౠ-Name[tg]=Ðауру -Name[th]=ภาษานาà¸à¸¸à¸£à¸¸ -Name[uk]=Ðауру -Name[uz@cyrillic]=Ðауру -Name[vi]=Nau-ru -Name[wa]=Nawouro -Name[zh_CN]=ç‘™é²è¯ -Name[zh_HK]=諾é¯èªž -Name[zh_TW]=諾é¯èªž -Name[zu]=Isi-Nauru [nb] Name=Norwegian BokmÃ¥l -Name[ar]=بوكماال النرويجية -Name[az]=NorveçcÉ™ (BokmÃ¥l) -Name[be]=ÐарвежÑÐºÐ°Ñ (бокмаль) -Name[bg]=Ðорвежки (букмол) -Name[bn]=নরওয়েজীয় বোকমাল -Name[br]=Norvegeg BokmÃ¥l -Name[bs]=NorveÅ¡ki BokmÃ¥l -Name[ca]=Noruec BokmÃ¥l -Name[cs]=Norský (BokmÃ¥l) -Name[csb]=Norwesczi BokmÃ¥l -Name[cy]=Bokmal Norwyeg -Name[da]=Norsk bokmÃ¥l -Name[de]=Norwegisch (BokmÃ¥l) -Name[el]=ÎοÏβηγικά BokmÃ¥l -Name[eo]=Norvega (Bokmal) -Name[es]=Noruego BokmÃ¥l -Name[et]=Norra bokmÃ¥l -Name[eu]=Norvegiera (BokmÃ¥l) -Name[fa]=نروژی بوکمال -Name[fi]=Norja (bokmÃ¥l) -Name[fr]=Norvégien Bokmaal -Name[fy]=Noarsk, BokmÃ¥l -Name[ga]=Ioruais (BokmÃ¥l) -Name[gl]=Noruegués (Bokmaal) -Name[he]=× ×•×¨×‘×’×™×ª BokmÃ¥l -Name[hi]=नारà¥à¤µà¥‡à¤œà¤¿à¤¯à¤¨ बोकमॉल -Name[hr]=NorveÅ¡ki BokmÃ¥l -Name[hsb]=Norwegsce (BokmÃ¥l) -Name[hu]=Norvég (bokmal) -Name[is]=Norska (bókmál) -Name[it]=Norvegese BokmÃ¥l -Name[ja]=ノルウェー語 (ブークモール) -Name[ka]=ნáƒáƒ ვეგიული (ბიáƒáƒ™áƒ›áƒáƒšáƒ˜) -Name[kk]=Ðорвег букмалша -Name[km]=áž“áŸážšážœáŸ‚ស បុកម៉ាល់ -Name[ko]=노르웨ì´ì–´ (Bokmaal) -Name[lb]=Norwegesch (BokmÃ¥l) -Name[lt]=Norvegų BokmÃ¥l -Name[lv]=NorvÄ“Ä£u (BokmÄlas) -Name[mk]=Ðорвешки BokmÃ¥l -Name[mn]=Ðорвеги, Бокмал -Name[nb]=Norsk, bokmÃ¥l -Name[nds]=Norweegsch (BokmÃ¥l) -Name[ne]=नरà¥à¤µà¥‡à¤²à¥€ बोकमल -Name[nl]=Noors BokmÃ¥l -Name[nn]=Norsk bokmÃ¥l -Name[nso]=Se-Norwegian BokmÃ¥l -Name[pa]=ਨੋਰਵਿਗੀਆਨ ਬੋਕਮਾਲ -Name[pl]=Norweski Bokmaal -Name[pt]=Norueguês BokmÃ¥l -Name[pt_BR]=Norueguês (Bokmaal) -Name[ro]=Norvegiană BokmÃ¥l -Name[ru]=ÐорвежÑкий (литературный) -Name[rw]=Ikibokumali nyanoruveje -Name[se]=Girjedárogiella -Name[sk]=nórsky bokmÃ¥l -Name[sl]=norveÅ¡ko (bokmaal) -Name[sr]=Ðорвешки (БокмалÑки) -Name[sr@Latn]=NorveÅ¡ki (Bokmalski) -Name[ss]=Si-Norwegian BokmÃ¥l -Name[sv]=Norskt bokmÃ¥l -Name[ta]=நாரà¯à®µà¯€à®œà®¿à®¯à®©à¯ பொகà¯à®®à®¾à®²à¯ -Name[te]=నారà±à°µà±€à°œà°¿à°¯à°¨à± బోకà±à°®à°¾à°²à± -Name[tg]=ÐорвегиÑгӣ Боқмал -Name[th]=ภาษานà¸à¸£à¹Œà¹€à¸§à¸¢à¹Œ (บ็à¸à¸„มัล) -Name[tr]=Norveççe BokmÃ¥l -Name[tt]=Norvegçä (ädäbi) -Name[uk]=Ðорвезька (BokmÃ¥l) -Name[uz]=Norvegcha (Bokmaal) -Name[uz@cyrillic]=Ðорвегча (Бокмаал) -Name[vi]=Na-uy (Bóc-mặn) -Name[wa]=Norvedjyin (BokmÃ¥l) -Name[zh_CN]=挪å¨è¯ (åšå…‹é©¬å°”è¯) -Name[zh_TW]=æŒªå¨ BokmÃ¥l -Name[zu]=Isi-Norwegian Bokmaal [nd] Name=Ndebele, North -Name[af]=Ndebele, Noord -Name[ar]=النديبيلي الشمالية -Name[az]=Ndebele, Åžimal -Name[be]=ÐдÑбель (поўнач) -Name[bg]=Северен Ðдебеле -Name[bn]=নà§â€Œà¦¦à§‡à¦¬à§‡à¦²à§‡, উতà§à¦¤à¦° -Name[br]=Ndebele, Norzh -Name[bs]=Ndebele, Sjeverni -Name[ca]=Ndebele, Nord -Name[cs]=Ndebele, Severnà -Name[csb]=Ndebele, Norda -Name[cy]=Ndebele, Gogledd -Name[da]=Ndebele, nord -Name[de]=Ndebele (nördliches) -Name[eo]=Norda Ndebele -Name[es]=Ndebele del norte -Name[et]=Põhja-ndebele -Name[eu]=Ndebelera (iparraldekoa) -Name[fa]=اندبل شمالی -Name[fi]=Ndebele, Pohjoinen -Name[fr]=Ndébélé du Nord -Name[fy]=Ndebele, Noard -Name[ga]=Ndebele Thuaidh -Name[gl]=Ndebele do norte -Name[he]=× ×“×‘×œ×” ×¦×¤×•× ×™×ª -Name[hi]=नेदेबेले, उतà¥à¤¤à¤° -Name[hr]=Ndebele, Sjeverni -Name[hsb]=Ndebele, Sewjerne -Name[hu]=Ndebele (északi) -Name[id]=Ndebele, Utara -Name[is]=Ndebele, norður -Name[it]=Ndebele settentrionale -Name[ja]=北ンデベレ語 -Name[ka]=ჩრდილრნდებელე -Name[kk]=СолтүÑік Ðдебеле -Name[km]=នដិបិលិ​ážáž¶áž„​ជើង -Name[ko]=ë¶ë¶€ ì€ë°ë²¨ë ˆ -Name[lb]=Ndebele (nördlech) -Name[lt]=Ndebele, Å iaurÄ—s -Name[mk]=Ðдебеле, Ñеверен -Name[mn]=ÐдÑбÑлÑ, умард -Name[nb]=Ndebele, Nord -Name[nds]=Ndebele, Noord -Name[ne]=डेबेले, उतà¥à¤¤à¤° -Name[nl]=Ndebele, Noord -Name[nn]=Ndebele, nord -Name[nso]=Se-Ndebele, sa Lebowa -Name[pa]=ਨਡੀਬੀਲੀ, ਉੱਤਰੀ -Name[pl]=Ndebele, Północ -Name[pt]=Ndebele do Norte -Name[pt_BR]=Ndebele, Norte -Name[ro]=Ndebelă nordică -Name[ru]=Сев. Ðдебеле -Name[rw]=Ikindebele, amajyaruguru -Name[se]=Ndebelegiella, davvi -Name[sk]=severná ndebelÄina -Name[sl]=ndebele, severno -Name[sq]=Nbedelisht të Veriut -Name[sr]=Ðдебеле, Северни -Name[sr@Latn]=Ndebele, Severni -Name[ss]=SiNdebele, sasenyakatfo -Name[sv]=Nordndebele -Name[ta]=டெபெலே, வட -Name[te]=నెబేలె, ఉతà±à°¤à°° -Name[tg]=Ðдебелӣ, Шимол -Name[th]=ภาษาà¸à¸¶à¸™à¹€à¸”เบเล ตà¸à¸™à¹€à¸«à¸™à¸·à¸ -Name[tt]=Ndebeleçä, Tönyaq -Name[uk]=Ðдебелє, Північна -Name[uz]=Ndebele, Shimol -Name[uz@cyrillic]=Ðдебеле, Шимол -Name[ven]=Ndebele, Devhula -Name[vi]=N-Ä‘e-be-lê (Bắc) -Name[wa]=Ndebele (bijhe) -Name[xh]=Isindebele, Emntla -Name[zh_CN]=Ndebele，北部 -Name[zh_HK]=Ndebele語，北部 -Name[zh_TW]=Ndebele語，北部 -Name[zu]=Isi-Ndebele, Sase-Ntshonalanga [nds] Name=Low Saxon -Name[af]=Lae Saxon -Name[be]=ÐіжнеÑакÑонÑÐºÐ°Ñ -Name[bg]=ДолноÑакÑонÑки -Name[bn]=নিমà§à¦¨ সà§à¦¯à¦¾à¦•à§à¦¸à¦¨ -Name[br]=Saozeg izel -Name[bs]=Niži saksonski -Name[ca]=Baix saxó -Name[cs]=Dolnosaský -Name[csb]=DolnosaksoÅ„sczi -Name[cy]=Sacsoneg Isel -Name[da]=Nedersaksisk -Name[de]=Niederdeutsch -Name[eo]=Malsupra Saksa -Name[es]=Sajón bajo -Name[et]=Alamsaksi -Name[eu]=Beheko Sajoniera -Name[fa]=ساکسونی سÙÙ„ÛŒ -Name[fi]=Alasaksa -Name[fr]=Bas saxon (ou francique, ou plattdeutsch) -Name[fy]=Neder Saksysk -Name[ga]=Sacsainis Ãochtarach -Name[gl]=Baixo Saxón -Name[hi]=लो सेकà¥à¤¸à¤¨ -Name[hr]=Donjosaksonski -Name[hsb]=Delnjosaksce -Name[hu]=Alsószász -Name[it]=Basso sassone -Name[ja]=低ザクセン語 -Name[ka]=ქვედრსáƒáƒ¥áƒ¡áƒáƒœáƒ£áƒ ი -Name[kk]=Төмен ÑакÑонша -Name[km]=ឡូសាក់សុង -Name[ku]=Saksonî ya Jêrîn -Name[lb]=Niddersächsesch -Name[lt]=Žemutinių saksonų -Name[lv]=Lejas sakÅ¡u -Name[mk]=ДолноÑакÑонÑки -Name[nb]=Lavgermansk -Name[nds]=Plattdüütsch -Name[ne]=लो साकà¥à¤¸à¥‹à¤¨ -Name[nl]=Nedersaksisch -Name[nn]=LÃ¥ggermansk -Name[pa]=ਲੋਅ ਸਾਕੋਨ -Name[pl]=DolnosaksoÅ„ski -Name[pt]=Baixo-Saxão -Name[pt_BR]=Baixa Saxonia -Name[ro]=Saxona de Jos -Name[ru]=ÐижнеÑакÑонÑкий -Name[rw]=Igisagisoni cyo hasi -Name[se]=Vuolil Sáksonagiella -Name[sk]=dolná saÅ¡tina -Name[sl]=spodnjesaÅ¡ko -Name[sr]=Доњи ÑакÑонÑки -Name[sr@Latn]=Donji saksonski -Name[sv]=LÃ¥gsaxiska -Name[ta]=லோ சாகà¯à®¸à®¾à®©à¯ -Name[te]=లో సాకà±à°¸à°¨à± -Name[tg]=СакÑон -Name[th]=ภาษาเยà¸à¸£à¸¡à¸±à¸™ ระดับล่าง -Name[tr]=AÅŸağı Sakson -Name[tt]=Saksonça, Asqı -Name[uk]=ÐижньоÑакÑонÑька -Name[uz]=Past Saksoncha -Name[uz@cyrillic]=ПаÑÑ‚ СакÑонча -Name[vi]=Xác-xá»nh thấp -Name[wa]=Bas sacson -Name[zh_CN]=æ’’å…‹é€Šè¯ -Name[zh_TW]=è–©å…‹éœèªž [ne] Name=Nepali -Name[ar]=نيبالي -Name[az]=Nepalca -Name[be]=ÐепальÑÐºÐ°Ñ -Name[bg]=Ðепали -Name[bn]=নেপালী -Name[br]=Nepaleg -Name[bs]=Nepalski -Name[ca]=Nepalà -Name[cs]=Nepálský -Name[csb]=Nepalsczi -Name[de]=Nepalesisch -Name[eo]=Nepala -Name[es]=Nepalà -Name[et]=Nepaali -Name[eu]=Nepalera -Name[fa]=نپالی -Name[fr]=Népalais -Name[fy]=Nepaleesk -Name[ga]=Neipealais -Name[he]=× ×¤×לית -Name[hi]=नेपाली -Name[hr]=Nepalski -Name[hsb]=Nepalezisce -Name[hu]=Nepáli -Name[id]=Nepal -Name[it]=Nepalese -Name[ja]=ãƒãƒ‘ール語 -Name[ka]=ნეპáƒáƒšáƒ£áƒ ი -Name[kk]=Ðепалша -Name[km]=áž“áŸáž”៉ាល់ -Name[ko]=네팔어 -Name[ku]=Nepalî -Name[lb]=Nepalesesch -Name[lt]=NepalieÄių -Name[lv]=NepÄlieÅ¡u -Name[mk]=ÐепалÑки -Name[mn]=Ðепал -Name[nds]=Nepaleesch -Name[ne]=नेपाली -Name[nl]=Nepalees -Name[nn]=Nepalsk -Name[nso]=Se-Nepali -Name[pa]=ਨੇਪਾਲੀ -Name[pl]=Nepalski -Name[pt]=Nepalês -Name[ro]=Nepaleză -Name[ru]=ÐепальÑкий -Name[rw]=Ikinyanepale -Name[se]=Nepálagiella -Name[sk]=nepálÄina -Name[sl]=nepalsko -Name[sq]=Nepalisht -Name[sr]=ÐепалÑки -Name[sr@Latn]=Nepalski -Name[ss]=SiNepali -Name[ta]=நேபாளி -Name[te]=నేపాలి -Name[tg]=Ðепалӣ -Name[th]=ภาษาเนปาล -Name[tr]=Nepalce -Name[tt]=Nepalça -Name[uk]=ÐепальÑька -Name[uz]=Nepalcha -Name[uz@cyrillic]=Ðепалча -Name[vi]=Ne-pa-li -Name[wa]=Nepalès -Name[zh_CN]=å°¼æ³Šå°”è¯ -Name[zh_HK]=尼泊爾語 -Name[zh_TW]=尼泊爾語 -Name[zu]=Isi-Nepali [ng] Name=Ndonga -Name[ar]=الندونغا -Name[be]=Ðдонга -Name[bg]=Ðдонга -Name[bn]=নডোঙà§à¦—া -Name[de]=Oshivambo -Name[fa]=اندونگا -Name[ga]=Ndongais -Name[he]=× ×“×•× ×’×” -Name[hi]=नदोनà¥à¤—ा -Name[ja]=ンドゥンガ語 -Name[ka]=ნდáƒáƒœáƒ’რ-Name[kk]=Ðдонга -Name[km]=នដុងហ្កា -Name[mk]=Ðдонга -Name[mn]=Ðдонга -Name[ne]=डोङà¥à¤—ा -Name[nso]=Se-Ndonga -Name[pa]=ਨਡੋਨਗਾ -Name[ro]=Ndongă -Name[ru]=Ðдонга -Name[rw]=Ikindonga -Name[se]=Ndongagiella -Name[sk]=ndonga -Name[sl]=ndonga -Name[sq]=Ndongisht -Name[sr]=Ðдонга -Name[ss]=SiNdonga -Name[ta]=டொஙà¯à®•à®¾ -Name[te]=డొంగా -Name[tg]=Ðдонга -Name[th]=ภาษาà¸à¸¶à¸™à¸”à¸à¸‡à¸à¸² -Name[tt]=Ndongaça -Name[uk]=Ðдонга -Name[uz@cyrillic]=Ðдонга -Name[vi]=N-Ä‘on-ga -Name[zh_HK]=Ndonga語 -Name[zh_TW]=Ndonga語 -Name[zu]=Isi-Ndonga [nl] Name=Dutch -Name[af]=Hollands -Name[ar]=الهولندية -Name[az]=FlamenkcÉ™ -Name[be]=ГаландÑÐºÐ°Ñ -Name[bg]=ХоландÑки -Name[bn]=ওলনà§à¦¦à¦¾à¦œ -Name[br]=Nederlandeg -Name[bs]=Nizozemski -Name[ca]=Holandès -Name[cs]=Holandský -Name[csb]=Hòlandzczi -Name[cy]=Iseldireg -Name[da]=Hollandsk -Name[de]=Niederländisch -Name[el]=Ολλανδικά -Name[eo]=Nederlanda -Name[es]=Holandés -Name[et]=Hollandi -Name[eu]=Nederlandera -Name[fa]=هلندی -Name[fi]=Hollanti -Name[fr]=Hollandais -Name[fy]=Nederlânsk -Name[ga]=Ollainnis -Name[gl]=Holandés -Name[he]=×”×•×œ× ×“×™×ª -Name[hi]=डच -Name[hr]=Nizozemski -Name[hsb]=Nižozemsce -Name[hu]=Holland -Name[id]=Belanda -Name[is]=Hollenska -Name[it]=Olandese -Name[ja]=オランダ語 -Name[ka]=ჰáƒáƒšáƒáƒœáƒ“იური -Name[kk]=Ðидреландша -Name[km]=ហុល្លង់ -Name[ko]=네ëœëž€ë“œì–´ -Name[ku]=Holendî -Name[lb]=Hollännesch -Name[lt]=Danų -Name[lv]=HolandieÅ¡u -Name[mi]=Reo Tenemaka -Name[mk]=ХоландÑки -Name[mn]=Дуч -Name[ms]=Belanda -Name[mt]=Olandiż -Name[nb]=Nederlandsk -Name[nds]=Nedderlannsch -Name[ne]=डच -Name[nl]=Nederlands -Name[nn]=Nederlandsk -Name[nso]=Se-Dutch -Name[oc]=Olandès -Name[pa]=ਡੱਚ -Name[pl]=Holenderski -Name[pt]=Holandês -Name[pt_BR]=Holandês -Name[ro]=Olandeză -Name[ru]=ГолландÑкий -Name[rw]=Ikinyaholande -Name[se]=Hollánddagiella -Name[sk]=holandÄina -Name[sl]=nizozemsko -Name[sq]=Hungarisht -Name[sr]=ХоландÑки -Name[sr@Latn]=Holandski -Name[ss]=SiDatji -Name[sv]=Holländska -Name[ta]=டசà¯à®šà¯ -Name[te]=à°¡à°šà± -Name[tg]=Олмонӣ -Name[th]=ภาษาดัทช์ -Name[tr]=Flamanca -Name[tt]=Dutça -Name[uk]=ÐідерландÑька -Name[uz]=Gollandcha -Name[uz@cyrillic]=Голландча -Name[vi]=Hoà -lan -Name[wa]=Neyerlandès -Name[xh]=Isidatshi -Name[zh_CN]=è·å…°è¯ -Name[zh_HK]=è·è˜èªž -Name[zh_TW]=è·è˜èªž -Name[zu]=Isi-Danishi [nn] Name=Norwegian Nynorsk -Name[af]=Noörweese Nynorsk -Name[ar]=نينورسك النرويجية -Name[az]=NorveçcÉ™ (Nynorsk) -Name[be]=ÐарвежÑÐºÐ°Ñ (нюнорÑк) -Name[bg]=Ðорвежки (нюнорÑк) -Name[bn]=নরওয়েজীয় নাইনরà§à¦¸à§à¦• -Name[br]=Norvegeg Nynorsk -Name[bs]=NorveÅ¡ki Nynorsk -Name[ca]=Noruec Nynorsk -Name[cs]=Norský (Nynorsk) -Name[csb]=Norwesczi Nynorsk -Name[cy]=Nynorsk Norwyeg -Name[da]=Nynorsk -Name[de]=Norwegisch (Nynorsk) -Name[el]=ÎοÏβηγικά Nynorsk -Name[eo]=Norvega (Nynorsk) -Name[es]=Noruego Nynorsk -Name[et]=Norra nynorsk -Name[eu]=Norvegiera (Nynorsk) -Name[fa]=نرس جدید نروژی -Name[fi]=Norja (nynorsk) -Name[fr]=Norvégien Nynorsk -Name[fy]=Noarsk, Nynorsk -Name[ga]=Ioruais (Nynorsk) -Name[gl]=Noruegués (Nynorsk) -Name[he]=× ×•×¨×‘×’×™×ª Nynorsk -Name[hi]=नारà¥à¤µà¥‡à¤œà¤¿à¤¯à¤¨ नायनोरसà¥à¤• -Name[hr]=NorveÅ¡ki Nynorsk -Name[hsb]=Norwegsce (Nynorsk) -Name[hu]=Norvég (nynorsk) -Name[id]=Norwegia (Nynorsk) -Name[is]=Norska (nýnorska) -Name[it]=Norvegese Nynorsk -Name[ja]=ノルウェー語 (ニーノシュク) -Name[ka]=ნáƒáƒ ვეგიული (ნინáƒáƒ სკი) -Name[kk]=Ðовег нунорÑкша -Name[km]=áž“áŸážšážœáŸ‚ស នីនូស -Name[ko]=노르웨ì´ì–´ (Nynorsk) -Name[ku]=Norwêcî Nynorsk -Name[lb]=Norwegesch (Nynorsk) -Name[lt]=Norvegų Nynorsk -Name[lv]=NorvÄ“Ä£u (Å…Å«norskas) -Name[mk]=Ðорвешки Nynorsk -Name[mn]=Ðорвеги ÐинорÑк -Name[nb]=Nynorsk -Name[nds]=Norweegsch Nynorsk -Name[ne]=नरà¥à¤µà¥‡à¤²à¥€ नाइनोरà¥à¤¸à¤• -Name[nl]=Noors, Nynorsk -Name[nn]=Norsk nynorsk -Name[nso]=Se-Norwegian Nynorsk -Name[pa]=ਨੋਰਵਿਗੀਆਨ ਨਯਾਨੋਰਸਕ -Name[pl]=Norweski Nynorsk -Name[pt]=Norueguês Nynorsk -Name[pt_BR]=Norueguês do Norte -Name[ro]=Norvegiană Nynorsk -Name[ru]=ÐорвежÑкий (нинорÑкий) -Name[rw]=Ikinyanoruveji nayinorusiki -Name[se]=OÄ‘Ä‘adárogiella -Name[sk]=nórsky nynorsk -Name[sl]=norveÅ¡ko (nyorsk) -Name[sq]=Norvegjisht (Nynorsk) -Name[sr]=Ðорвешки (Ðиноршки) -Name[sr@Latn]=NorveÅ¡ki (NinorÅ¡ki) -Name[ss]=Si-Norwegian Nynorsk -Name[sv]=Nynorska -Name[ta]=நாரà¯à®µà¯€à®œà®¿à®¯à®©à¯ (நையோரà¯à®¸à¯à®•à¯) -Name[te]=నారà±à°µà±€à°œà°¿à°¯à°¨à± à°¨à±à°¯à±‹à°°à±à°¸à±à°•à± -Name[tg]=ÐорвегиÑгӣ ÐунорÑк -Name[th]=ภาษานà¸à¸£à¹Œà¹€à¸§à¸¢à¹Œ (นูนà¸à¸£à¹Œà¸ªà¸„ฺ) -Name[tr]=Norveççe Nynorsk -Name[tt]=Norwejçä (Ninorsk) -Name[uk]=Ðорвезька (Nynorsk) -Name[uz]=Norvegiyacha (Nynorsk) -Name[uz@cyrillic]=ÐорвегиÑча (ÐйнорÑк) -Name[vi]=Na-uy (Ny-noạ-x-kh) -Name[wa]=Noû-Norvedjyin (Nynorsk) -Name[zh_CN]=挪å¨è¯ (尼诺斯克è¯) -Name[zh_HK]=æŒªå¨ Nynorsk 語 -Name[zh_TW]=æŒªå¨ Nynorsk 語 -Name[zu]=Isi-Norwegian Nynorsk [nr] Name=Ndebele, South -Name[af]=Ndebele, Suid -Name[ar]=النديبيلي الجنوبية -Name[az]=Ndebele, CÉ™nub -Name[be]=ÐдÑбель (поўдзень) -Name[bg]=Южен Ðдебеле -Name[bn]=নà§â€Œà¦¦à§‡à¦¬à§‡à¦²à§‡, দকà§à¦·à¦¿à¦£ -Name[br]=Ndebele, Su -Name[bs]=Ndebele, Južni -Name[ca]=Ndebele, Sud -Name[cs]=Ndebele, Jižnà -Name[csb]=Ndebele, Pôłnie -Name[cy]=Ndebele, De -Name[da]=Ndebele, syd -Name[de]=Ndebele (südliches) -Name[eo]=Suda Ndebele -Name[es]=Ndebele del sur -Name[et]=Lõuna-ndebele -Name[eu]=Ndebelera (hegoaldekoa) -Name[fa]=اندبل جنوبی -Name[fi]=Ndebele, Etelä -Name[fr]=Ndébélé du Sud -Name[fy]=Ndebele, Súd -Name[ga]=Ndebele Theas -Name[gl]=Ndebele do Sur -Name[he]=× ×“×‘×œ×” דרומית -Name[hi]=नेदेबेले,दकà¥à¤·à¤¿à¤£ -Name[hr]=Ndebele, Južni -Name[hsb]=Ndebele, Južne -Name[hu]=Ndebele (déli) -Name[id]=Ndebele, Selatan -Name[is]=Ndebele, suður -Name[it]=Ndebele meridionale -Name[ja]=å—ンデベレ語 -Name[ka]=სáƒáƒ›áƒ®áƒ ეთ ნდებელე -Name[kk]=ОңтүÑтік ндебеле -Name[km]=នដិបិលិ​ážáž¶áž„​ážáŸ’បូង -Name[ko]=남부 ì€ë°ë²¨ë ˆ -Name[lb]=Ndebele (südlecht) -Name[lt]=Ndebele, Pietų -Name[mk]=Ðдебеле, јужен -Name[mn]=ÐдÑбÑлÑ, өмнөд -Name[nb]=Ndebele, Sør -Name[nds]=Ndebele, Sööd -Name[ne]=डेबेले, दकà¥à¤·à¤¿à¤£ -Name[nl]=Ndebele, Zuid -Name[nn]=Ndebele, sør -Name[nso]=Se-Ndebele, sa Borwa -Name[pa]=ਨਡੀਬੀਲੀ, ਦੱਖਣੀ -Name[pl]=Ndebele, PoÅ‚udnie -Name[pt]=Ndebele do Sul -Name[pt_BR]=Ndebele, Sul -Name[ro]=Ndebelă sudică -Name[ru]=Юж. Ðдебеле -Name[rw]=Ikindebele, Amajyepfo -Name[se]=Ndebelegiella, lulli -Name[sk]=južná ndebelÄina -Name[sl]=ndebele, južno -Name[sq]=NBedelisht të Jugut -Name[sr]=Ðдебеле, Јужни -Name[sr@Latn]=Ndebele, Južni -Name[ss]=SiNdebele, saseningizimu -Name[sv]=Sydndebele -Name[ta]=டெபெலே, தென௠-Name[te]=నెబేలె, దకà±à°·à°¿à°£ -Name[tg]=Ðдебелӣ, Ҷануб -Name[th]=ภาษาà¸à¸¶à¸™à¹€à¸”เบเล ตà¸à¸™à¹ƒà¸•à¹‰ -Name[tt]=Ndebeleçä, Könyaq -Name[uk]=Ðдебелє, Південна -Name[uz]=Ndebele, Janub -Name[uz@cyrillic]=Ðдебеле, Жануб -Name[ven]=Ndebele, Tshipembe -Name[vi]=N-Ä‘e-be-lê (Nam) -Name[wa]=Ndebele (nonne) -Name[xh]=Isindebele, Emazantsi -Name[zh_CN]=Ndebele，å—部 -Name[zh_HK]=Ndebele語，å—部 -Name[zh_TW]=Ndebele語，å—部 -Name[zu]=Isi-Ndebele, Sase-Mzansi [nso] Name=Northern Sotho -Name[af]=Noord Sotho -Name[ar]=السوتو الشمالية -Name[az]=Åžimali Sotho -Name[be]=Паўночнае Сота -Name[bg]=Северен Сото -Name[bn]=উতà§à¦¤à¦° সোথো -Name[br]=Soto, Norzh -Name[bs]=Sjeverni Soto -Name[ca]=Sotho del nord -Name[cs]=Severnà Sotho -Name[csb]=Nordowé Sotho -Name[cy]=Sotho'r Gogledd -Name[da]=Nord Sotho -Name[de]=Nord-Sotho -Name[eo]=Norda Sotoa -Name[es]=Sotho del norte -Name[et]=Põhja-sotho -Name[eu]=Sothoera (iparraldekoa) -Name[fa]=سوتوی شمالی -Name[fi]=Pohjoissotho -Name[fr]=Sotho du Nord -Name[fy]=Noard Sotho -Name[ga]=Seipidis -Name[gl]=Sotho do Norte -Name[hi]=नारà¥à¤¦à¤°à¥à¤¨ सोथो -Name[hr]=Sjeverni Sotho -Name[hsb]=Sewjerne Sotho -Name[hu]=Északi sotho -Name[is]=Norður Sotho -Name[it]=Sotho settentrionale -Name[ja]=北ソト語 -Name[ka]=ჩრდილრსáƒáƒ¢áƒ -Name[kk]=СолтүÑтік Ñото -Name[km]=សូធូ​ជើង -Name[ko]=ë¶ë¶€ ì†Œí† ì–´ -Name[lb]=Nördlecht Sotho -Name[lt]=Å iaurÄ—s Sotho -Name[lv]=Ziemeļu Sotho -Name[mk]=Северен Сото -Name[mn]=Умард Сото -Name[ms]=Sotho Utara -Name[nb]=Nord-Sotho -Name[nds]=Noord-Sotho -Name[ne]=उतà¥à¤¤à¤°à¥€ सोथो -Name[nl]=Noord-Sotho -Name[nn]=Nord-Sotho -Name[pa]=ਉੱਤਰੀ ਸੋਥੋ -Name[pl]=Północne Sotho -Name[pt]=Sotho do Norte -Name[pt_BR]=Sotho do Norte -Name[ro]=Soto nordică -Name[ru]=Северное Сото -Name[rw]=Igisoto cy'Amajyaruguru -Name[se]=Davvi-sothogiella -Name[sk]=severná sothÄina -Name[sl]=severni sotho -Name[sq]=Sothisht Të Veriut -Name[sr]=Северни Ñото -Name[sr@Latn]=Severni soto -Name[sv]=Nordsotho -Name[ta]=நாரà¯à®¤à®©à¯ சோதà¯à®¤à¯‹ -Name[te]=ఉతà±à°¤à°° సొతొ -Name[tg]=Сотои Шимолӣ -Name[th]=ภาษาโซโธ ตà¸à¸™à¹€à¸«à¸™à¸·à¸ -Name[tt]=Tönyaq Sotho -Name[uk]=Північне Сото -Name[uz]=Shimoliy Sotocha -Name[uz@cyrillic]=Шимолий Соточа -Name[vi]=Xô-tô (Bắc) -Name[wa]=Soto (bijhe) -Name[zh_CN]=北部æ¢æ‰˜è¯ [nv] Name=Navajo -Name[ar]=الناÙاجو -Name[az]=Navayoca -Name[be]=Ðаваё -Name[bg]=Ðавахо -Name[bn]=নাà¦à¦¾à§Ÿà§‹ -Name[el]=Îάβαχο -Name[eo]=Navaha -Name[et]=Navaho -Name[fa]=ناواجو -Name[fi]=Navaho -Name[fr]=Navaho -Name[ga]=Navachóis -Name[gl]=Navaxo -Name[he]=× ×‘×חו -Name[hi]=नवाजो -Name[hr]=Navaho -Name[ja]=ナãƒãƒ›èªž -Name[ka]=ნáƒáƒ•áƒáƒ®áƒ -Name[kk]=Ðавахо -Name[km]=ណាវាហ្សូ -Name[ko]=나바조어 -Name[mk]=Ðавахо -Name[mn]=ÐаваÑа -Name[ne]=नेà¤à¤¾à¤œà¥‹ -Name[nso]=Se-Navajo -Name[pa]=ਨਾਵਾਜੋ -Name[ru]=Ðавахо -Name[rw]=Ikinavajo -Name[se]=Naváhogiella -Name[sk]=navajo -Name[sl]=navajo -Name[sq]=Navahisht -Name[sr]=Ðавахо -Name[sr@Latn]=Navaho -Name[ss]=Si-Navajo -Name[sv]=Navaho -Name[ta]=நவாஜோ -Name[te]=నవాజొ -Name[tg]=Ðаваҷо -Name[th]=ภาษานาวาโฮ -Name[tt]=Navaxoça -Name[uk]=Ðавахо -Name[uz@cyrillic]=Ðаважо -Name[vi]=Na-va-cá»™ -Name[wa]=Navaxho -Name[zh_CN]=纳瓦éœè¯ -Name[zh_HK]=ç´ç“¦ä¼™èªž -Name[zh_TW]=ç´ç“¦ä¼™èªž -Name[zu]=Isi-Navajo [ny] Name=Chichewa -Name[ar]=التشيشيوا -Name[az]=Çiçeva -Name[be]=ЧычÑва -Name[bg]=Чеуа -Name[bn]=চিচেওয়া -Name[de]=Nyanja -Name[eo]=Ĉiĉeva -Name[fa]=چیچوا -Name[fi]=Njandža -Name[ga]=Siseivis -Name[he]=צ'יצ'ווה -Name[hi]=चिचेवा -Name[hu]=Csicseva -Name[ja]=ãƒã‚§ãƒ¯èªž -Name[ka]=ჩიჩევრ-Name[kk]=Чичева -Name[km]=ចីចិវ៉ា -Name[lb]=Nyanja -Name[lv]=ÄŒiÄevieÅ¡u -Name[mk]=Чичева -Name[mn]=Чичева -Name[ne]=चिचेवा -Name[nso]=Se-Chichewa -Name[pa]=ਚਿਚੀਵਾ -Name[ro]=Ciceuă -Name[ru]=Чичева -Name[rw]=Igicicewa -Name[se]=Chichevagiella -Name[sk]=ÄiÄewa -Name[sl]=chichewa -Name[sq]=Çiçevisht -Name[sr]=ЧичевÑки -Name[sr@Latn]=ÄŒiÄevski -Name[ss]=Si-Chichewa -Name[sv]=Chewa -Name[ta]=சிசà¯à®šà¯†à®µà®¾ -Name[te]=చిచెవా -Name[tg]=Чичевагӣ -Name[th]=ภาษาชิเชวา -Name[tt]=Çiçewaça -Name[uk]=ЧічеванÑька -Name[uz]=Chicheva -Name[uz@cyrillic]=Чичева -Name[vi]=Chi-che-ouă -Name[wa]=Tchitchewa -Name[zh_CN]=é½åˆ‡ç“¦è¯ -Name[zh_HK]=Chichewa語 -Name[zh_TW]=Chichewa語 -Name[zu]=Isi-Chichewa [oc] Name=Occitan -Name[af]=Okkitaan -Name[ar]=الأوكسيتانية -Name[az]=Oksitan -Name[be]=ÐкітанÑÐºÐ°Ñ -Name[bg]=ОкÑитанÑки -Name[bn]=ওকà§à¦¸à¦¿à¦Ÿà¦¾à¦¨ -Name[br]=Oksitaneg -Name[ca]=Occità -Name[cs]=Okcitánský -Name[csb]=Ã’kcitaÅ„sczi -Name[cy]=Occitaneg -Name[de]=Okzitanisch -Name[eo]=Okcitana -Name[es]=Occitano -Name[et]=Oktsitaani -Name[eu]=Okzitaniera -Name[fa]=اÙکیتان -Name[fi]=Oksitaani -Name[fy]=Oksitaansk -Name[ga]=Ocatáinis -Name[gl]=Occitano -Name[he]=×¤×¨×•×‘× ×¡×œ×™×ª -Name[hi]=ओसिटान -Name[hsb]=Okcitansce -Name[hu]=Okcitán -Name[it]=Occitano -Name[ja]=オック語 -Name[ka]=áƒáƒ¥áƒ˜áƒ¢áƒáƒœáƒ£áƒ ი (ფრáƒáƒœáƒ’ული დიáƒáƒšáƒ”ქტი) -Name[kk]=ОÑÑитанша -Name[km]=អុកស៊ីážáž„់ -Name[ko]=오í¬ì–´ -Name[ku]=Oksîtanî -Name[lb]=Okzitanesch -Name[lv]=OkitÄņu -Name[mk]=Очитан -Name[mn]=ОкÑитан -Name[mt]=OÄ‹Ä‹itan -Name[nb]=Oksitansk -Name[nds]=Okzitaansch -Name[ne]=ओकà¥à¤¸à¤¿à¤Ÿà¤¾à¤¨ -Name[nn]=Oksitansk -Name[nso]=Se-Occitan -Name[oc]=Occità n -Name[pa]=ਓਸੀਟਾਨ -Name[pl]=OkcytaÅ„ski -Name[pt]=Occitano -Name[ro]=Occitană -Name[ru]=ФранцузÑкий (диалект Occitan) -Name[rw]=Icyogisitani -Name[se]=Oksitánagiella -Name[sk]=okcitánÄina -Name[sl]=oÄitansko -Name[sq]=Oksitanisht -Name[sr]=ОцитанÑки -Name[sr@Latn]=Ocitanski -Name[ss]=Si-Occitan -Name[sv]=Occitanska -Name[ta]=ஒகà¯à®šà®¿à®Ÿà¯à®Ÿà®¾à®©à¯ -Name[te]=à°’à°¸à±à°¸à°¿à°Ÿà°¾à°¨à± -Name[tg]=Окитанӣ -Name[th]=ภาษาà¸à¸à¸„ซิทัน -Name[tr]=Oksitan dili -Name[tt]=Okkitança -Name[uk]=ОкÑітанÑька -Name[uz]=Fransuzcha (Ossitan shevasi) -Name[uz@cyrillic]=Французча (ОÑÑитан шеваÑи) -Name[vi]=Óc-ci-tan -Name[zh_CN]=奥西å¦è¯ -Name[zh_HK]=Occitan語 -Name[zh_TW]=Occitan語 -Name[zu]=Isi-Osithani [om] Name=Oromo -Name[ar]=الأورومو -Name[az]=Oromoca -Name[be]=Ðрома -Name[bg]=Ðфан Оромо -Name[bn]=ওরোমো -Name[eo]=Oroma -Name[fa]=اورومو -Name[ga]=Oraimis -Name[he]=×ורומו -Name[hi]=ओरोमो -Name[hr]=Oromski -Name[ja]=オãƒãƒ¢èªž -Name[ka]=áƒáƒ áƒáƒ›áƒ -Name[kk]=Оромо -Name[km]=អុរុមុ -Name[ko]=오로모어 -Name[mk]=Оромо -Name[mn]=Оромо -Name[ne]=ओरोमो -Name[nso]=Se-Oromo -Name[pa]=ਓਰੋਮੋ -Name[ro]=Oromă -Name[ru]=Оромо -Name[rw]=Icyoromo -Name[se]=Oromogiella -Name[sk]=oromÄina -Name[sl]=oromo -Name[sq]=Oromisht -Name[sr]=ОромÑки -Name[sr@Latn]=Oromski -Name[ss]=Si-Oromo -Name[ta]=ஒரோமோ -Name[te]=ఒరొమొ -Name[tg]=Оромо -Name[th]=ภาษาโà¸à¹‚รโม -Name[tt]=Oromoça -Name[uk]=Оромо -Name[uz@cyrillic]=Оромо -Name[vi]=O-ro-mô -Name[zh_CN]=é˜¿æ›¼è¯ -Name[zh_HK]=Oromo語 -Name[zh_TW]=Oromo語 -Name[zu]=Isi-Oromo [or] Name=Oriya -Name[ar]=لغة أهل أوريسا )الهند( -Name[az]=Oriyaca -Name[be]=ÐžÑ€Ñ‹Ñ -Name[bg]=ÐžÑ€Ð¸Ñ -Name[bn]=ওড়িয়া -Name[eo]=Orijo -Name[et]=Orija -Name[fa]=اوریا -Name[fi]=Orija -Name[ga]=OirÃsis -Name[gl]=Orisa -Name[he]=×וריה -Name[hi]=ओरिया -Name[hu]=Orija -Name[ja]=オリヤー語 -Name[ka]=áƒáƒ ირ-Name[kk]=ÐžÑ€Ð¸Ñ -Name[km]=អូរីយ៉ា -Name[ko]=오리야어 -Name[lb]=Orija -Name[mk]=Орија -Name[mn]=ÐžÑ€Ð¸Ñ -Name[ne]=ओरिया -Name[nso]=Se-Oriya -Name[pa]=ਉੜੀਆ -Name[ro]=Oriană -Name[ru]=ÐžÑ€Ð¸Ñ -Name[rw]=Icyoriya -Name[se]=Orijagiella -Name[sk]=urÃjÄina -Name[sl]=oriya -Name[sq]=Orijisht -Name[sr]=ОријÑки -Name[sr@Latn]=Orijski -Name[ss]=Si-Oriya -Name[ta]=ஒரியா -Name[te]=ఒరియా -Name[tg]=Ориёӣ -Name[th]=ภาษาโà¸à¸£à¸´à¸¢à¸² -Name[uk]=ÐžÑ€Ñ–Ñ -Name[uz@cyrillic]=ÐžÑ€Ð¸Ñ -Name[vi]=Ô-ri-yạ -Name[zh_CN]=æ¬§é‡Œäºšè¯ -Name[zh_HK]=Oriya語 -Name[zh_TW]=Oriya語 -Name[zu]=Isi-Oriya [os] Name=Ossetian -Name[ar]=الأوسيتية -Name[az]=Osetiyaca -Name[be]=ÐÑетынÑÐºÐ°Ñ -Name[bg]=ОÑетинÑки -Name[bn]=ওসেটিয়ান -Name[br]=Ossetieg -Name[bs]=Osetski -Name[ca]=Oseti -Name[cs]=Osetský -Name[csb]=Ã’setaÅ„sczi -Name[cy]=Oseteg -Name[de]=Ossetisch -Name[eo]=Oseta -Name[es]=Osetio -Name[et]=Osseedi -Name[eu]=Osetiera -Name[fa]=اوستی Ù‚Ùقاز -Name[fi]=Osseetti -Name[fr]=Ossète -Name[fy]=Ossetysk -Name[ga]=Óiséitis -Name[gl]=Oseto -Name[he]=×וסטית -Name[hi]=ओसेटियन -Name[hr]=Osetski -Name[hsb]=Osetisce -Name[hu]=Oszét -Name[it]=Ossetiano -Name[ja]=オセット語 -Name[ka]=áƒáƒ¡áƒ£áƒ ი -Name[kk]=ОÑетинше -Name[km]=អូសសិážáŸ’យុង -Name[ko]=오세티안어 -Name[lb]=Ossetesch -Name[lt]=Osetinų -Name[lv]=Osetīņu -Name[mk]=ОÑетиÑки -Name[mn]=ОÑÑетан -Name[nb]=Ossetisk -Name[nds]=Osseetsch -Name[ne]=ओसेसियन -Name[nl]=Ossetisch -Name[nn]=Ossetisk -Name[nso]=Se-Ossetian -Name[pa]=ਓਸੀਟੀਅਨ -Name[pl]=OsetaÅ„ski -Name[pt]=Osseta -Name[ro]=Osetiană -Name[ru]=ОÑетинÑкий -Name[rw]=Icyosetiyani -Name[se]=Ossetiagiella -Name[sk]=osetÄina -Name[sl]=osetijsko -Name[sq]=Osetianisht -Name[sr]=ОÑетÑки -Name[sr@Latn]=Osetski -Name[ss]=Si-Ossetian -Name[sv]=Ossetsiska -Name[ta]=ஒசெடà¯à®Ÿà®¿à®¯à®©à¯ -Name[te]=à°’à°¸à±à°¸à±†à°·à°¿à°¯à°¨à± -Name[tg]=ОÑетинӣ -Name[th]=ภาษาโà¸à¸‹à¸´à¹€à¸Šà¸µà¸¢à¸™ -Name[tt]=Ossetinçä -Name[uk]=ОÑетинÑька -Name[uz]=Ossetincha -Name[uz@cyrillic]=ОÑÑетинча -Name[vi]=Óc-xe-ti-an -Name[wa]=Ossete -Name[zh_CN]=å¥¥å¡žæ¢¯è¯ -Name[zh_HK]=Ossetian語 -Name[zh_TW]=Ossetian語 -Name[zu]=Isi-Ossethiyani [pa] -Name=Panjabi -Name[ar]=بنجابي -Name[az]=PanjabicÉ™ -Name[be]=Панджабі -Name[bg]=Панджаби -Name[bn]=পাঞà§à¦œà¦¾à¦¬à§€ -Name[br]=Pendjabieg -Name[cs]=Pandžábský -Name[csb]=Pendżabsczi -Name[de]=Pandschabi -Name[eo]=PanÄaba -Name[es]=Punjabà -Name[et]=Pandžabi -Name[eu]=Punjabera -Name[fa]=پنجابی -Name[fi]=Pandžabi -Name[fr]=Pendjabi -Name[ga]=Painseáibis -Name[gl]=Panxabi -Name[he]=×¤× ×’'בית -Name[hi]=पंजाबी -Name[hr]=Pandžabski -Name[hsb]=Pandźabisce -Name[hu]=Pandzsabi -Name[it]=Punjabi -Name[ja]=ãƒãƒ³ã‚¸ãƒ£ãƒ¼ãƒ–語 -Name[ka]=პენჯáƒáƒ‘ი -Name[kk]=Панждаби -Name[km]=ពូនយ៉ាប៊ី -Name[ko]=펀잡어 -Name[ku]=Pêncabî -Name[lb]=Panjabi-Sprooch -Name[lt]=Pendžabo -Name[lv]=Pandžabu -Name[mk]=Пунџаби -Name[mn]=Панжаби -Name[nds]=Pandschaabsch -Name[ne]=पनà¥à¤œà¤¾à¤¬à¥€ -Name[nso]=Se-Panjabi -Name[pa]=ਪੰਜਾਬੀ -Name[pl]=Pendżabski -Name[ro]=Panjabă -Name[ru]=Панджаби -Name[rw]=Igipanjabi -Name[se]=Panjabigiella -Name[sk]=pandžábÄina -Name[sl]=pandžabsko -Name[sq]=Panjabisht -Name[sr]=ПенџабÑки -Name[sr@Latn]=Pendžabski -Name[ss]=Si-Panjabi -Name[ta]=பஞà¯à®šà®¾à®ªà®¿ -Name[te]=పంజాబి -Name[tg]=Панҷабӣ -Name[th]=ภาษาปัà¸à¸ˆà¸²à¸šà¸µ -Name[tt]=Panjabça -Name[uk]=ПанджабÑька -Name[uz]=Panjabcha -Name[uz@cyrillic]=Панжабча -Name[vi]=Pan-gia-bi -Name[wa]=Pundjabi -Name[zh_CN]=æ—é®æ™®è¯ -Name[zh_HK]=Panjabi語 -Name[zh_TW]=Panjabi語 -Name[zu]=Isi-Phanjabi +Name=Punjabi [pi] Name=Pali -Name[ar]=البالي -Name[az]=PalicÉ™ -Name[be]=Палі -Name[bg]=Пали -Name[bn]=পালি -Name[br]=Palieg -Name[eo]=Palio -Name[es]=Palà -Name[et]=Paali -Name[fa]=پالی -Name[ga]=Páilis -Name[he]=פ×לי -Name[hi]=पाली -Name[ja]=パーリ語 -Name[ka]=ფáƒáƒšáƒáƒ£áƒ ი -Name[kk]=Пали -Name[km]=បាលី -Name[mk]=Пали -Name[mn]=Пали -Name[ne]=पाली -Name[nso]=Se-Pali -Name[pa]=ਪਾਲੀ -Name[ru]=Пали -Name[rw]=Igipali -Name[se]=Páligiella -Name[sk]=pálà -Name[sl]=pali -Name[sq]=Palisht -Name[sr]=ПалијÑки -Name[sr@Latn]=Palijski -Name[ss]=Si-Pali -Name[ta]=பாலி -Name[te]=పాళి -Name[tg]=Пали -Name[th]=ภาษาบาลี -Name[tt]=Paliçä -Name[uk]=Палі -Name[uz@cyrillic]=Пали -Name[vi]=Pa-li -Name[wa]=Pâli -Name[zh_CN]=å·´åˆ©è¯ -Name[zh_HK]=巴利語 -Name[zh_TW]=巴利語 -Name[zu]=Isi-Phali [pl] Name=Polish -Name[af]=Poolse -Name[ar]=البولندية -Name[az]=Polyakca -Name[be]=ПольÑÐºÐ°Ñ -Name[bg]=ПолÑки -Name[bn]=পোলিশ -Name[br]=Poloneg -Name[bs]=Poljski -Name[ca]=Polonès -Name[cs]=Polský -Name[csb]=Pòlsczi -Name[cy]=Pwyleg -Name[da]=Polsk -Name[de]=Polnisch -Name[el]=Πολωνικά -Name[eo]=Pola -Name[es]=Polaco -Name[et]=Poola -Name[eu]=Poloniera -Name[fa]=لهستانی -Name[fi]=Puola -Name[fr]=Polonais -Name[fy]=Poalsk -Name[ga]=Polainnis -Name[gl]=Polaco -Name[he]=×¤×•×œ× ×™×ª -Name[hi]=पोलिश -Name[hr]=Poljski -Name[hsb]=Pólsce -Name[hu]=Lengyel -Name[id]=Polandia -Name[is]=Pólska -Name[it]=Polacco -Name[ja]=ãƒãƒ¼ãƒ©ãƒ³ãƒ‰èªž -Name[ka]=პáƒáƒšáƒáƒœáƒ£áƒ ი -Name[kk]=ПолÑкша -Name[km]=ប៉ូឡូញ -Name[ko]=í´ëž€ë“œì–´ -Name[ku]=Polî -Name[lb]=Polnesch -Name[lt]=Lenkų -Name[lv]=Poļu -Name[mi]=Reo Pörana -Name[mk]=ПолÑки -Name[mn]=Польш -Name[mt]=Pollakk -Name[nb]=Polsk -Name[nds]=Poolsch -Name[ne]=पोलीश -Name[nl]=Pools -Name[nn]=Polsk -Name[nso]=Se-Polish -Name[oc]=Pòlònès -Name[pa]=ਪੋਲੈਂਡੀ -Name[pl]=Polski -Name[pt]=Polaco -Name[pt_BR]=Polonês -Name[ro]=Poloneză -Name[ru]=ПольÑкий -Name[rw]=Ikinyapolonye -Name[se]=Polskkagiella -Name[sk]=poľština -Name[sl]=poljsko -Name[sq]=Polonisht -Name[sr]=ПољÑки -Name[sr@Latn]=Poljski -Name[ss]=Si-Polish -Name[sv]=Polska -Name[ta]=போலிஷ௠-Name[te]=పోలిషౠ-Name[tg]=ПолÑкӣ -Name[th]=ภาษาโปลิช -Name[tr]=Lehçe -Name[tt]=Polça -Name[uk]=ПольÑька -Name[uz]=Polyakcha -Name[uz@cyrillic]=ПолÑкча -Name[vi]=Ba-lan -Name[wa]=Polonès -Name[zh_CN]=æ³¢å…°è¯ -Name[zh_HK]=æ³¢è˜èªž -Name[zh_TW]=æ³¢è˜èªž -Name[zu]=Isi-Pholishi [ps] Name=Pushto -Name[ar]=باشتو -Name[az]=PuÅŸtoca -Name[be]=Пушту -Name[bg]=Пущу -Name[bn]=পà§à¦¸à§à¦¤ -Name[ca]=Pashto -Name[de]=Paschtu -Name[eo]=PaÅtua -Name[es]=Pastún -Name[et]=PuÅ¡tu -Name[eu]=Paxtuera -Name[fa]=پشتو -Name[fi]=PaÅ¡tu -Name[ga]=Paistis -Name[he]=פשטו -Name[hi]=पशà¥à¤¤à¥‹ -Name[hsb]=PuÅ¡to -Name[hu]=Pusto -Name[it]=Pashto -Name[ja]=パシュトー語 -Name[ka]=პუშტუ -Name[kk]=Пушту -Name[km]=ប៉ាសážáž¼ -Name[ko]=í‘¸ì‹œí† ì–´ -Name[lb]=Paschtu -Name[lt]=PuÅ¡tÅ«nų -Name[lv]=PuÅ¡tu -Name[mk]=Пушто -Name[mn]=Пушто -Name[nds]=Paschtuunsch -Name[ne]=पà¥à¤¸à¥à¤¤à¥‹ -Name[nso]=Se-Pushto -Name[pa]=ਪà©à¨¶à¨¤à©‹ -Name[ro]=PuÅŸtă -Name[ru]=ПуштунÑкий -Name[rw]=Igipushito -Name[se]=PuÅ¡tugiella -Name[sk]=paÅ¡tÄina -Name[sl]=pushto -Name[sq]=Pushtisht -Name[sr]=Пушто -Name[sr@Latn]=PuÅ¡to -Name[ss]=Si-Pushto -Name[sv]=Pashto -Name[ta]=பாஷà¯à®Ÿà¯à®©à¯ -Name[te]=à°ªà±à°·à±à°¤à±Š -Name[tg]=Пушто -Name[th]=ภาษาพาชโต -Name[tt]=PuÅŸtu FarsÃçası -Name[uk]=ПуштунÑька -Name[uz]=Pushtuncha -Name[uz@cyrillic]=Пуштунча -Name[vi]=Pu-x-tô -Name[wa]=Pashto -Name[zh_CN]=æ™®ä»€å›¾è¯ -Name[zh_HK]=普什圖語 -Name[zh_TW]=普什圖語 -Name[zu]=Dudula ku [pt] Name=Portuguese -Name[af]=Portugese -Name[ar]=البرتغالية -Name[az]=Portuqalca -Name[be]=ПартугальÑÐºÐ°Ñ -Name[bg]=ПортугалÑки -Name[bn]=পরà§à¦¤à§à¦—ীজ -Name[br]=Portugaleg -Name[bs]=Portugalski -Name[ca]=Portuguès -Name[cs]=Portugalský -Name[csb]=Pòrtugalsczi -Name[cy]=Portiwgaleg -Name[da]=Portugisisk -Name[de]=Portugiesisch -Name[el]=ΠοÏτογαλικά -Name[eo]=Portugala -Name[es]=Portugués -Name[et]=Portugali -Name[eu]=Portugesa -Name[fa]=پرتغالی -Name[fi]=Portugali -Name[fr]=Portugais -Name[fy]=Portugeesk -Name[ga]=Portaingéilis -Name[gl]=Portugués -Name[he]=פורטוגזית -Name[hi]=पोरà¥à¤¤à¥à¤—ीस -Name[hr]=Portugalski -Name[hsb]=Portugalsce -Name[hu]=Portugál -Name[id]=Portugis -Name[is]=Portúgalska -Name[it]=Portoghese -Name[ja]=ãƒãƒ«ãƒˆã‚¬ãƒ«èªž -Name[ka]=პáƒáƒ ტუგáƒáƒšáƒ£áƒ ი -Name[kk]=Португалша -Name[km]=áž–áŸážšáž‘ុយហ្គាល់ -Name[ko]=í¬ë¥´íˆ¬ê°ˆì–´ -Name[ku]=Portûgalî -Name[lb]=Portugisesch -Name[lt]=Portugalų -Name[lv]=PortugÄļu -Name[mi]=Reo Pötikï -Name[mk]=ПортугалÑки -Name[mn]=Португал -Name[ms]=Portugis -Name[mt]=Portugiż -Name[nb]=Portugisisk -Name[nds]=Portugeesch -Name[ne]=पोरà¥à¤šà¥à¤—ाली -Name[nl]=Portugees -Name[nn]=Portugisisk -Name[nso]=Sepotokisi -Name[oc]=Pòrtuguès -Name[pa]=ਪà©à¨°à¨¤à¨—ਾਲੀ -Name[pl]=Portugalski -Name[pt]=Português -Name[pt_BR]=Português -Name[ro]=Portugheză -Name[ru]=ПортугальÑкий -Name[rw]=Igiporutigali -Name[se]=Portugálagiella -Name[sk]=portugalÄina -Name[sl]=portugalsko -Name[sq]=Portugalisht -Name[sr]=ПортугалÑки -Name[sr@Latn]=Portugalski -Name[ss]=SiPutukezi -Name[sv]=Portugisiska -Name[ta]=போரà¯à®¤à¯à®¤à¯à®•à¯à®•à¯€à®šà®¿à®¯ -Name[te]=పోరà±à°Ÿà±à°¯à±à°—ీసౠ-Name[tg]=Португалӣ -Name[th]=ภาษาโปรตุเà¸à¸ª -Name[tr]=Portekizce -Name[tt]=Portugalça -Name[uk]=ПортугальÑька -Name[uz]=Portugalcha -Name[uz@cyrillic]=Португалча -Name[vi]=Bồ-Ä‘Ã o-nha -Name[wa]=Portuguès -Name[zh_CN]=è‘¡è„ç‰™è¯ -Name[zh_HK]=è‘¡è„牙語 -Name[zh_TW]=è‘¡è„牙語 -Name[zu]=Isi-Phuthukesi [pt_BR] -Name=Brazilian Portuguese -Name[ar]=البرتغالية البرازيلية -Name[az]=Braziliya Portuqalcası -Name[be]=ПартугальÑÐºÐ°Ñ Ð±Ñ€Ð°Ð·Ñ–Ð»ÑŒÑÐºÐ°Ñ -Name[bg]=БразилÑки португалÑки -Name[bn]=বà§à¦°à¦¾à¦œà¦¿à¦²à§€à§Ÿ পরà§à¦¤à§à¦—ীজ -Name[br]=Portugaleg Brazil -Name[bs]=Brazilski portugalski -Name[ca]=Brasiler Portuguès -Name[cs]=Portugalský (BrazÃlie) -Name[csb]=Brazylsczi pòrtugalsczi -Name[cy]=Portiwgaleg Brasil -Name[da]=Brasiliansk portugisisk -Name[de]=Brasilianisches Portugiesisch -Name[el]=ΠοÏτογαλικά Î’Ïαζιλίας -Name[eo]=Portugala (Brazilo) -Name[es]=Portugués brasileño -Name[et]=Brasiilia portugali -Name[eu]=Portugesa (Brasilgoa) -Name[fa]=پرتغالی برزیلی -Name[fi]=Brasilian Portugali -Name[fr]=Portugais Brésilien -Name[fy]=Braziliaansk Portugeesk -Name[ga]=Portaingéilis na BrasaÃle -Name[gl]=Portugués Do Brasil -Name[he]=פורטוגזית ברזיל×ית -Name[hi]=बà¥à¤°à¤¾à¤œà¤¿à¤²à¤¿à¤¯à¤¨ पà¥à¤°à¥à¤¤à¤—ाली -Name[hr]=Brazilski portugalski -Name[hsb]=Portugalsce (Brazilska) -Name[hu]=Portugál (brazil) -Name[id]=Portugis Brazil -Name[is]=BrasÃlÃsk Portúgalska -Name[it]=Portoghese brasiliano -Name[ja]=ブラジル ãƒãƒ«ãƒˆã‚¬ãƒ«èªž -Name[ka]=ბრáƒáƒ–ილიური (პáƒáƒ ტუგáƒáƒšáƒ£áƒ ი) -Name[kk]=БразилиÑлық португалша -Name[km]=ប្រáŸážŸáŸŠáž¸áž› áž–áŸážšáž‘ុយហ្គាល់ -Name[ko]=브ë¼ì§ˆì‹ í¬ë¥´íˆ¬ê°ˆì–´ -Name[ku]=Portûgalî ya Brazîl -Name[lb]=Brazilianescht Portugisesch -Name[lt]=Brazilijos portugalų -Name[lv]=BrazÄ«lijas portugÄļu -Name[mk]=БразилÑки португалÑки -Name[mn]=Бразилын португал -Name[ms]=Portugis Brazil -Name[nb]=Brasil-portugisisk -Name[nds]=Brasiliaansch Portugeesch -Name[ne]=बà¥à¤°à¤¾à¤œà¤¿à¤²à¥€ पोरà¥à¤šà¥à¤—ाली -Name[nl]=Braziliaans Portugees -Name[nn]=Brasil-portugisisk -Name[pa]=ਬਰਾਜ਼ੀਲ ਪà©à¨°à¨¤à¨—ਾਲੀ -Name[pl]=Portugalski (brazylijski) -Name[pt]=Português do Brasil -Name[pt_BR]=Português do Brasil -Name[ro]=Portugheză braziliană -Name[ru]=ПортугальÑкий (БразилиÑ) -Name[rw]=Igiporutigali cya Burezile -Name[se]=BrasilialaÅ¡ portugálagiella -Name[sk]=portugalÄina (BrazÃlia) -Name[sl]=brazilska portugalÅ¡Äina -Name[sq]=Portugalishte Braziliane -Name[sr]=БразилÑко португалÑки -Name[sr@Latn]=Brazilsko portugalski -Name[sv]=Brasiliansk portugisiska -Name[ta]=பிரேஸிலிய போரà¯à®¤à¯à®¤à¯à®•à¯à®•à¯€à®šà®¿à®¯ -Name[te]=à°¬à±à°°à°¾à°œà°¿à°²à°¿à°¯à°¨à± పోరà±à°Ÿà±à°¯à±à°—ీసౠ-Name[tg]=БразилиÑÓ£ Португалӣ -Name[th]=ภาษาโปรตุเà¸à¸ªà¸šà¸£à¸²à¸‹à¸´à¸¥ -Name[tr]=Brezilya Portekizcesi -Name[tt]=Portugalça, Brasil -Name[uk]=БразильÑька португальÑька -Name[uz]=Portugalcha (Braziliya) -Name[uz@cyrillic]=Португалча (БразилиÑ) -Name[vi]=Bồ-Ä‘Ã o-nha (Bra-xin) -Name[wa]=Portuguès do Braezi -Name[zh_CN]=巴西葡è„ç‰™è¯ -Name[zh_HK]=巴西葡è„牙語 -Name[zh_TW]=巴西葡è„牙語 +Name=Portuguese (Brazil) [qu] Name=Quechua -Name[ar]=الكويتشيوا -Name[az]=KveçcÉ™ -Name[be]=КÑчуа -Name[bg]=Кечуа -Name[bn]=কেচà§à§Ÿà¦¾ -Name[br]=Kechuaeg -Name[eo]=Keĉua -Name[et]=KetÅ¡ua -Name[eu]=Kitxua -Name[fa]=کوچوا -Name[fi]=KetÅ¡ua -Name[ga]=Ceatsuais -Name[he]=קצ'ו××” -Name[hi]=कà¥à¤µà¥‡à¤šà¥à¤† -Name[hu]=Kecsua -Name[ja]=ケãƒãƒ¥ã‚¢èªž -Name[ka]=კეჩურ-Name[kk]=Кечуа -Name[km]=កáŸáž‘្ជូអា -Name[ko]=케추아어 -Name[lb]=Quechua-Sprooch -Name[mk]=Кечуа -Name[mn]=Куечуа -Name[nds]=Ketschua -Name[ne]=कà¥à¤µà¥‡à¤šà¤‰ -Name[nso]=Se-Quechua -Name[pa]=ਕਿਉਚà©à¨† -Name[ru]=Кечуа -Name[rw]=Igikwecuwa -Name[se]=KeÄÄuagiella -Name[sk]=keÄuánÄina -Name[sl]=quechua -Name[sq]=Keçisht -Name[sr]=Квечва -Name[sr@Latn]=KveÄva -Name[ss]=Si-Quechua -Name[ta]=கà¯à®µà¯†à®šà¯à®šà®¾ -Name[te]=à°•à±à°µà±†à°šà±à°µà°¾ -Name[tg]=Квечуа -Name[th]=ภาษาเคชัว -Name[tt]=Queçuaça -Name[uk]=Кечуа -Name[uz]=Kvechua -Name[uz@cyrillic]=Квечуа -Name[vi]=Quê-chua -Name[wa]=Kitchwa -Name[zh_CN]=ç›–ä¸˜äºšè¯ -Name[zh_HK]=蓋楚瓦語 -Name[zh_TW]=蓋楚瓦語 -Name[zu]=Isi-Quechua [rn] Name=Rundi -Name[ar]=رواندي -Name[az]=RundicÉ™ -Name[be]=Рундзі -Name[bg]=Руанда -Name[bn]=রà§à¦£à§à¦¡à¦¿ -Name[cy]=Rwndi -Name[eo]=Ruanda -Name[fa]=روندی -Name[fy]=Rûandeesk -Name[he]=×¨×•× ×“×™ -Name[hi]=रूनà¥à¤¡à¥€ -Name[ja]=ルンディ語 -Name[ka]=რუნდი -Name[kk]=Рунди -Name[km]=រូន្ឌី -Name[ko]=룬디어 -Name[lb]=Rundi-Sprooch -Name[mk]=Рунди -Name[mn]=Рунди -Name[ne]=रूनà¥à¤¡à¥€ -Name[nso]=Se-Rundi -Name[pa]=ਰੂਡੀ -Name[ru]=Рунди -Name[rw]=Ikirundi -Name[se]=Rundigiella -Name[sk]=rundÄina -Name[sl]=rundi -Name[sq]=Rundisht -Name[sr]=Рунди -Name[ss]=Si-Rundi -Name[ta]=à®°à¯à®£à¯à®Ÿà®¿ -Name[te]=à°°à±à°‚à°¡à°¿ -Name[tg]=Рунди -Name[th]=ภาษารุนดิ -Name[tt]=Rundiçä -Name[uk]=Рунді -Name[uz@cyrillic]=Рунди -Name[vi]=Run-Ä‘i -Name[wa]=Kirundi -Name[zh_CN]=åŸºéš†è¿ªè¯ -Name[zh_HK]=Rundi語 -Name[zh_TW]=Rundi語 -Name[zu]=Isi-Rundi [ro] Name=Romanian -Name[af]=Romeens -Name[ar]=الرومانية -Name[az]=Rumınca -Name[be]=РумынÑÐºÐ°Ñ -Name[bg]=РумънÑки -Name[bn]=রোমানীয় -Name[br]=Roumaneg -Name[bs]=Rumunski -Name[ca]=Romanès -Name[cs]=Rumunský -Name[csb]=Rumùńsczi -Name[cy]=Romaneg -Name[da]=Rumænsk -Name[de]=Rumänisch -Name[el]=Ρουμανικά -Name[eo]=Rumana -Name[es]=Rumano -Name[et]=Rumeenia -Name[eu]=Errumaniera -Name[fa]=رومانیایی -Name[fi]=Romania -Name[fr]=Roumain -Name[fy]=Roemeensk -Name[ga]=Rómáinis -Name[gl]=Romanés -Name[he]=×¨×•×ž× ×™×ª -Name[hi]=रोमानियन -Name[hr]=Rumunjski -Name[hsb]=Rumunsce -Name[hu]=Román -Name[id]=Rumania -Name[is]=Rúmenska -Name[it]=Rumeno -Name[ja]=ルーマニア語 -Name[ka]=რუმინული -Name[kk]=Румынша -Name[km]=រូម៉ានី -Name[ko]=루마니아어 -Name[ku]=Romanî -Name[lb]=Rumänesch -Name[lt]=Rumunų -Name[lv]=RumÄņu -Name[mi]=Reo Romeinia -Name[mk]=РоманÑки -Name[mn]=Роман -Name[ms]=Romania -Name[mt]=Rumen -Name[nb]=Rumensk -Name[nds]=Rumäänsch -Name[ne]=रोमनियाली -Name[nl]=Roemeens -Name[nn]=Rumensk -Name[nso]=Se-Romanian -Name[pa]=ਰੋਮਾਨੀਆਈ -Name[pl]=RumuÅ„ski -Name[pt]=Romeno -Name[pt_BR]=Romeno -Name[ro]=Română -Name[ru]=РумынÑкий -Name[rw]=Ikinyarumaniya -Name[se]=Romániagiella -Name[sk]=rumunÄina -Name[sl]=romunsko -Name[sq]=Rumanisht -Name[sr]=РумунÑки -Name[sr@Latn]=Rumunski -Name[ss]=SiRoma -Name[sv]=Rumänska -Name[ta]=உரà¯à®®à¯‡à®©à®¿à®¯à®©à¯ -Name[te]=రొమేనియనౠ-Name[tg]=Романӣ -Name[th]=ภาษาโรมาเนีย -Name[tr]=Romence -Name[tt]=Romança -Name[uk]=РумунÑька -Name[uz]=Rumincha -Name[uz@cyrillic]=Руминча -Name[vi]=Rô-ma-ni-a -Name[wa]=Roumin -Name[zh_CN]=ç½—é©¬å°¼äºšè¯ -Name[zh_HK]=羅馬尼亞語 -Name[zh_TW]=羅馬尼亞語 -Name[zu]=Isi-Romania [rom] Name=Romany -Name[be]=РаманÑÐºÐ°Ñ -Name[bg]=РомÑки -Name[br]=Jipsianek -Name[bs]=Romanski -Name[ca]=Caló -Name[cs]=Romský -Name[csb]=Rumùńsczi -Name[de]=Romani -Name[el]=Ρουμανία -Name[eo]=Romaa -Name[es]=Rumanà -Name[et]=Mustlaskeel -Name[eu]=Errumaniera -Name[fa]=رومانی -Name[fi]=Romani -Name[fr]=Rromani -Name[ga]=Romainis -Name[gl]=Romanés -Name[he]=×¨×•×ž× ×™×” -Name[hr]=Romanski -Name[hu]=Lovári cigány -Name[is]=RúmenÃa -Name[it]=Rom -Name[ja]=ãƒãƒžãƒ‹ãƒ¼èªž -Name[ka]=რáƒáƒ›áƒáƒœáƒ£áƒšáƒ˜ -Name[kk]=Цыганша -Name[km]=រូម៉ានី -Name[lb]=Romani -Name[mk]=РомÑки -Name[ms]=Romania -Name[nb]=Romani -Name[nds]=Romaneesch -Name[ne]=रोमानी -Name[nl]=Roma -Name[nn]=Romani -Name[pa]=ਰੋਮੇ -Name[pl]=Romski -Name[pt]=Romani -Name[pt_BR]=Romani -Name[ro]=Å¢igănească -Name[ru]=ЦыганÑкий -Name[se]=Románigiella -Name[sk]=rómÄina -Name[sl]=romsko -Name[sr]=РомÑки -Name[sr@Latn]=Romski -Name[sv]=Romanés -Name[te]=రొమని -Name[tg]=Романӣ -Name[th]=ภาษาโรมานี -Name[tr]=Çingene Dili -Name[uk]=ЦиганÑька -Name[vi]=Rô-ma-ny -Name[zh_CN]=å‰æ™®èµ›è¯ -Name[zh_TW]=å‰æ™®è³½èªž [ru] Name=Russian -Name[af]=Russies -Name[ar]=الروسية -Name[az]=Rusca -Name[be]=РаÑійÑÐºÐ°Ñ -Name[bg]=РуÑки -Name[bn]=রà§à¦¶ -Name[br]=Rusianeg -Name[bs]=Ruski -Name[ca]=Rus -Name[cs]=Ruský -Name[csb]=Rusczi -Name[cy]=Rwsieg -Name[da]=Russisk -Name[de]=Russisch -Name[el]=Ρωσικά -Name[eo]=Rusa -Name[es]=Ruso -Name[et]=Vene -Name[eu]=Errusiera -Name[fa]=روسی -Name[fi]=Venäjä -Name[fr]=Russe -Name[fy]=Russysk -Name[ga]=Rúisis -Name[gl]=Ruso -Name[he]=רוסית -Name[hi]=रशियन -Name[hr]=Ruski -Name[hsb]=Rusce -Name[hu]=Orosz -Name[id]=Rusia -Name[is]=Rússneska -Name[it]=Russo -Name[ja]=ãƒã‚·ã‚¢èªž -Name[ka]=რუსული -Name[kk]=ОрыÑша -Name[km]=រុស្សី -Name[ko]=러시아어 -Name[ku]=Rûsî -Name[lb]=Russesch -Name[lt]=Rusų -Name[lv]=Krievu -Name[mi]=Reo Ruhia -Name[mk]=РуÑки -Name[mn]=ÐžÑ€Ð¾Ñ -Name[ms]=Russia -Name[mt]=Russu -Name[nb]=Russisk -Name[nds]=Russ'sch -Name[ne]=रसियाली -Name[nl]=Russisch -Name[nn]=Russisk -Name[nso]=Se-Russian -Name[oc]=Rus -Name[pa]=ਰੂਸੀ -Name[pl]=Rosyjski -Name[pt]=Russo -Name[pt_BR]=Russo -Name[ro]=Rusă -Name[ru]=РуÑÑкий -Name[rw]=Ikirusiya -Name[se]=RuoÅ¡Å¡agiella -Name[sk]=ruÅ¡tina -Name[sl]=rusko -Name[sq]=Rusisht -Name[sr]=РуÑки -Name[sr@Latn]=Ruski -Name[ss]=SiRashiya -Name[sv]=Ryska -Name[ta]=இரஷியன௠-Name[te]=రషియనౠ-Name[tg]=Ð Ó¯ÑÓ£ -Name[th]=ภาษารัสเซีย -Name[tr]=Rusça -Name[tt]=Urısça -Name[uk]=РоÑійÑька -Name[uz]=Ruscha -Name[uz@cyrillic]=РуÑча -Name[vi]=Nga -Name[wa]=Rûsse -Name[xh]=Isirashiya -Name[zh_CN]=ä¿„è¯ -Name[zh_HK]=俄語 -Name[zh_TW]=俄語 -Name[zu]=Isi-Rashiya [rw] Name=Kinyarwanda -Name[ar]=الكينارواندا -Name[az]=Kinyarvandaca -Name[be]=КіньÑрванда -Name[bg]=КиниÑруанда -Name[bn]=কিনà§à¦¯à¦¾à¦°à¦“য়াণà§à¦¡à¦¾ -Name[et]=Ruanda -Name[eu]=Kinyaruanda -Name[fa]=کینیارواندایی -Name[fi]=Ruanda -Name[ga]=Cinearuáindis -Name[gl]=Quiñaruanda -Name[he]=×§×™× ×™×™×¨×•×× ×“×” -Name[hi]=किनà¥à¤¯à¤¾à¤°à¤µà¤¾à¤¨à¥à¤¡à¤¾ -Name[hr]=Kinidžaruandski -Name[hu]=Kinjarvanda -Name[ja]=ルワンダ語 -Name[ka]=კინიáƒáƒ ვáƒáƒœáƒ“რ-Name[kk]=КиньÑруанда -Name[km]=គីនយ៉ាវ៉ាន់ដា -Name[ko]=키ëƒë¥´ì™„다어 -Name[lb]=Ruanda-Sprooch -Name[mk]=Кинјарванда -Name[mn]=КинÑрванда -Name[ne]=किनà¥à¤¯à¤°à¤µà¤¾à¤¨à¥à¤¡à¤¾ -Name[nso]=Se-Kinyarwanda -Name[pa]=ਕਿਨਯਾਰਵਾਡਾਂ -Name[ro]=Chiniaruandeză -Name[ru]=КиньÑруанда -Name[rw]=Ikinyarwanda -Name[se]=Kinyarwandagiella -Name[sk]=rwandÄina -Name[sl]=kinyarwanda -Name[sq]=Kinjaruandaisht -Name[sr]=КинијарвандаÑки -Name[sr@Latn]=Kinijarvandaski -Name[ss]=Si-Kinyarwanda -Name[sv]=Rwanda -Name[ta]=கினà¯à®¯à®¾à®°à¯à®µà®¾à®£à¯à®Ÿà®¾ -Name[te]=à°•à°¿à°¨à±à°¨à±à°¯à°¾à°°à±à°µà°¾à°‚à°¡à°¾ -Name[tg]=Кинуарвандӣ -Name[th]=ภาษาคินยาร์วันดา -Name[tt]=Kinyarwandaça -Name[uk]=КіньÑрванда -Name[uz]=Kinyarvanda -Name[uz@cyrillic]=КинÑрванда -Name[vi]=Ki-nyă-ouanh-Ä‘a -Name[wa]=Kiniarwanda -Name[zh_CN]=å¢æ—ºè¾¾è¯ -Name[zh_HK]=Kinyarwanda語 -Name[zh_TW]=Kinyarwanda語 -Name[zu]=Isi-Kinyarwanda [sa] Name=Sanskrit -Name[ar]=سنسيكريتي -Name[az]=SanskritcÉ™ -Name[be]=СанÑкрыт -Name[bg]=СанÑкрит -Name[bn]=সংসà§à¦•à§ƒà¦¤ -Name[cy]=Sansgrit -Name[el]=ΣανσκÏιτικά -Name[eo]=Sanskrito -Name[es]=Sanscrito -Name[et]=Sanskriti -Name[eu]=Sanskritoa -Name[fa]=سانسکریت -Name[fy]=Sanskryt -Name[ga]=Sanscrait -Name[gl]=Sánscrito -Name[he]=×¡× ×¡×§×¨×™×˜ -Name[hi]=संसà¥à¤•à¥ƒà¤¤ -Name[hu]=Szanszkrit -Name[id]=Sansekerta -Name[is]=SanskrÃt -Name[it]=Sanscrito -Name[ja]=サンスクリット語 -Name[ka]=სáƒáƒœáƒ¡áƒ™áƒ იტი -Name[kk]=СанÑкрит -Name[km]=សំស្ក្រឹហ-Name[ko]=범어 -Name[lt]=Sanskritas -Name[lv]=Sanskrits -Name[mk]=СанÑкрит -Name[mn]=СанÑкрит -Name[ne]=संसà¥à¤•à¥ƒà¤¤ -Name[nso]=Se-Sanskrit -Name[pa]=ਸੰਸਕà©à¨°à¨¿à¨¤ -Name[pl]=Sanskryt -Name[pt]=Sanscrito -Name[ro]=Sanscrită -Name[ru]=СанÑкрит -Name[rw]=Igisansikiriti -Name[se]=Sanskrihtagiella -Name[sk]=sanskrit -Name[sl]=sanskrt -Name[sq]=Sanskritisht -Name[sr]=СанÑкрит -Name[ss]=Si-Sanskrit -Name[ta]=சமஸà¯à®•à®¿à®°à¯à®¤à®®à¯ -Name[te]=సంసà±à°•à±à°°à±à°¤à°‚ -Name[tg]=СанÑкрит -Name[th]=ภาษาสันสà¸à¸¤à¸• -Name[tt]=Sanskritçä -Name[uk]=СанÑкрит -Name[uz@cyrillic]=СанÑкрит -Name[vi]=Xan-s-cợ-rÃth -Name[zh_CN]=æ¢µè¯ -Name[zh_HK]=梵語 -Name[zh_TW]=梵語 -Name[zu]=Isi-Sanskrit [sc] Name=Sardinian -Name[ar]=الساردينية -Name[be]=СардынÑÐºÐ°Ñ -Name[bg]=СардинÑки -Name[bn]=সারà§à¦¡à¦¿à¦¨à¦¿à§Ÿà¦¾à¦¨ -Name[br]=Sardinieg -Name[bs]=Sardinijski -Name[ca]=Sard -Name[cs]=Sardinský -Name[csb]=SardiÅ„sczi -Name[cy]=Sardinieg -Name[da]=Sardinsk -Name[de]=Sardisch -Name[el]=ΣαÏδηνιακά -Name[eo]=Sarda -Name[es]=Sardo -Name[et]=Sardiinia -Name[eu]=Sardiera -Name[fa]=ساردینی -Name[fi]=Sardi -Name[fr]=Sarde -Name[fy]=Sardinysk -Name[ga]=SairdÃnis -Name[gl]=Sardo -Name[he]=×¡×¨×“×™× ×™×ª -Name[hi]=सारदिनी -Name[hr]=Sardinijski -Name[hsb]=Sardinsce -Name[hu]=SzardÃniai -Name[is]=SardÃnÃska -Name[it]=Sardo -Name[ja]=サルデーニャ語 -Name[ka]=სáƒáƒ დინიული -Name[kk]=Сардинше -Name[km]=សារឌីណង់ -Name[ko]=사르디니아어 -Name[lb]=Sardinesch -Name[lt]=Sardinijos -Name[lv]=SardÄ«nieÅ¡u -Name[mk]=СардиниÑки -Name[mn]=Сардин -Name[nb]=Sardisk -Name[nds]=Sardiensch -Name[ne]=सरà¥à¤¦à¤¿à¤¨à¤¿à¤¯à¤¨ -Name[nl]=Sardinisch -Name[nn]=Sardiniansk -Name[nso]=Se-Sardinian -Name[pa]=ਸਾਰਡੀਨੀਆਨ -Name[pl]=SardyÅ„ski -Name[pt]=Sardenho -Name[ro]=Sardiniană -Name[ru]=СардинийÑкий -Name[rw]=Ikinyasaridini -Name[se]=Sardiniagiella -Name[sk]=sardÃnÄina -Name[sl]=sardinsko -Name[sq]=Sardinisht -Name[sr]=СардинијÑки -Name[sr@Latn]=Sardinijski -Name[ss]=Si-Sardinian -Name[sv]=Sardiska -Name[ta]=சாரà¯à®Ÿà¯€à®©à®¿à®¯à®©à¯ -Name[te]=సారà±à°¡à°¿à°¨à°¿à°¯à°¨à± -Name[tg]=СардиниÑгӣ -Name[th]=ภาษาซาร์ดิเนียน -Name[tt]=Sardinça -Name[uk]=СардинÑька -Name[uz]=Sardincha -Name[uz@cyrillic]=Сардинча -Name[vi]=Xa-Ä‘i-ni-a -Name[wa]=Sardinyin -Name[zh_CN]=æ’’ä¸è¯ -Name[zh_HK]=è–©ä¸å°¼äºžèªž -Name[zh_TW]=è–©ä¸å°¼äºžèªž -Name[zu]=Isi-Sardinian [sd] Name=Sindhi -Name[ar]=سندي -Name[be]=Сіндхі -Name[bg]=Синдхи -Name[bn]=সিনà§à¦§à¦¿ -Name[br]=Sindhieg -Name[eo]=Sinda -Name[fa]=سیندهی -Name[ga]=Sindis -Name[he]=×¡×™× ×“×”×™ -Name[hi]=सिंधी -Name[hu]=Szindi -Name[is]=Shindi -Name[ja]=シンド語 -Name[ka]=სინდჰი -Name[kk]=Синдхи -Name[km]=ស៊ីន្ដី -Name[ko]=ì‹ ë””ì–´ -Name[lb]=Sindhi-Sprooch -Name[mk]=Синди -Name[mn]=Синди -Name[ne]=सिनà¥à¤§à¥€ -Name[nso]=Se-Sindhi -Name[pa]=ਸਿੰਧੀ -Name[ro]=Sindi -Name[ru]=Синдхи -Name[rw]=Igisindi -Name[se]=Sindhigiella -Name[sk]=sindhÄina -Name[sl]=sindijsko -Name[sq]=Sindisht -Name[sr]=СиндиÑки -Name[sr@Latn]=Sindiski -Name[ss]=Si-Sindhi -Name[ta]=சிநà¯à®¤à®¿ -Name[te]=సింధి -Name[tg]=Синдхӣ -Name[th]=ภาษาสินธุ -Name[tt]=Sindihçä -Name[uk]=Синдхі -Name[uz]=Sindxi -Name[uz@cyrillic]=Синдхи -Name[vi]=Xin-Ä‘i -Name[wa]=Sindi -Name[zh_HK]=Sindhi語 -Name[zh_TW]=Sindhi語 -Name[zu]=Isi-Sindi [se] Name=Northern Sami -Name[af]=Noordelike Sami -Name[ar]=السامي الشمالية -Name[az]=Åžimali Sami -Name[be]=Самі (поўнач) -Name[bg]=Северен Сами -Name[bn]=উতà§à¦¤à¦° সামি -Name[br]=Sami, Norzh -Name[bs]=Sjeverni Sami -Name[ca]=Sami del nord -Name[cs]=Severnà Sami -Name[csb]=Nordowi Sami -Name[cy]=Sami'r Gogledd -Name[da]=Nordsamisk -Name[de]=Nördliches Sami -Name[eo]=Norda Samea -Name[es]=Samà del norte -Name[et]=Põhja-saami -Name[eu]=Samia (iparrekoa) -Name[fa]=سامی شمالی -Name[fi]=Pohjoissaame -Name[fr]=Sami du Nord -Name[fy]=Noard-Koreaansk -Name[ga]=Sáimis Thuaidh -Name[gl]=Sami do Norte -Name[he]=ס×מית ×¦×¤×•× ×™×ª -Name[hi]=नारà¥à¤¦à¤°à¥à¤¨ सामी -Name[hr]=Sjeverni Sami -Name[hsb]=Sewjernosamisce -Name[hu]=Északi szami -Name[is]=Norður Sami -Name[it]=Sami settentrionale -Name[ja]=北サーミ語 -Name[ka]=ჩრდილრსáƒáƒáƒ›áƒ˜ -Name[kk]=СолтүÑтік Ñаами -Name[km]=សាមីជើង -Name[ko]=ë¶ë¶€ 사미어 -Name[lb]=Nördlecht Sami -Name[lt]=Å iaurÄ—s Sami -Name[mk]=Северен Сами -Name[mn]=Умард Сами -Name[ms]=Sami Utara -Name[nb]=Nordsamisk -Name[nds]=Noord-Saamsch -Name[ne]=उतà¥à¤¤à¤°à¥€ सामी -Name[nl]=Noord Sami -Name[nn]=Nordsamisk -Name[nso]=Se-Sami sa Lebowa -Name[pa]=ਉੱਤਰੀ ਸਾਮੀ -Name[pl]=Północny Sami -Name[pt]=Sami do Norte -Name[pt_BR]=Sami do Norte -Name[ro]=Sami nordică -Name[ru]=Северное Саами -Name[rw]=Igisami amajyaruguru -Name[se]=Davvisámegiella -Name[sk]=severná saamÄina -Name[sl]=severno sami -Name[sq]=Sami Verior -Name[sr]=СеверноÑамÑки -Name[sr@Latn]=Severnosamski -Name[ss]=SiSami sasenyakatfo -Name[sv]=Samiska -Name[ta]=நாரà¯à®¤à®©à¯ சாமி -Name[te]=ఉతà±à°¤à°° సమి -Name[tg]=Саамаи шимолӣ -Name[th]=ภาษาซามี ตà¸à¸™à¹€à¸«à¸™à¸·à¸ -Name[tt]=Tönyaq Sami -Name[uk]=Північна Саамі -Name[uz]=Shimoliy Sami -Name[uz@cyrillic]=Шимолий Сами -Name[ven]=Sami ya Devhula -Name[vi]=Xa-mi (Bắc) -Name[wa]=Bijhe sÃ¥mi -Name[xh]=Sami Yasemntla -Name[zh_CN]=åŒ—éƒ¨æ²™ç±³è¯ -Name[zh_HK]=北薩米語 -Name[zh_TW]=北薩米語 -Name[zu]=Isi-Sami Sase-Ntshonalanga [sg] Name=Sango -Name[ar]=السانغو -Name[az]=Sagno -Name[be]=Санга -Name[bg]=Сангро -Name[bn]=সাংগো -Name[eo]=Sangoa -Name[fa]=سانگو -Name[ga]=Sangóis -Name[he]=ס×× ×’×• -Name[hi]=सैनà¥à¤—ो -Name[hu]=Szangó -Name[ja]=サンゴ語 -Name[ka]=სáƒáƒœáƒ’რ-Name[kk]=Санго -Name[km]=សង់ហ្គោ -Name[lb]=Sango-Sprooch -Name[mk]=Санго -Name[mn]=Санго -Name[ne]=साङà¥à¤—ो -Name[nso]=Se-Sango -Name[pa]=ਸਾਂਗੋ -Name[ro]=Sangă -Name[ru]=Санго -Name[rw]=Igisango -Name[se]=Sangogiella -Name[sk]=sango -Name[sl]=sango -Name[sq]=Sangisht -Name[sr]=Санго -Name[ss]=Si-Sango -Name[ta]=சாஙà¯à®•à¯‹ -Name[te]=సాంగొ -Name[tg]=Санго -Name[th]=ภาษาà¹à¸‹à¸‡à¹‚ภ-Name[tt]=Sangoça -Name[uk]=Санго -Name[uz@cyrillic]=Санго -Name[vi]=Xan-gô -Name[zh_CN]=æ¡‘æˆˆè¯ -Name[zh_HK]=Sango語 -Name[zh_TW]=Sango語 -Name[zu]=Isi-Sango [si] Name=Sinhalese -Name[ar]=السينهالية -Name[az]=Sinhalca -Name[be]=СінгальÑÐºÐ°Ñ -Name[bg]=СингалÑки -Name[bn]=সিংহলী -Name[br]=Singaleg -Name[bs]=SinhaleÅ¡ki -Name[ca]=Sinhalès -Name[cs]=Sinhalský -Name[csb]=Synagelsczi -Name[cy]=Sinhaleg -Name[da]=Sinhalesisk -Name[de]=Singhalesisch -Name[eo]=Sinhala -Name[es]=Sinhalés -Name[et]=Singaleesi -Name[eu]=Sinhala -Name[fa]=سینهالس -Name[fi]=Sinhali -Name[fr]=Singhalais -Name[fy]=Singaleesk -Name[ga]=Siolóinis -Name[gl]=Sinhalés -Name[he]=×¡×™× ×”×œ×–×™×ª -Name[hi]=सिंहली -Name[hr]=Sinhalski -Name[hsb]=Singalsce -Name[hu]=Szingaléz -Name[is]=Shinhalese -Name[it]=Cingalese -Name[ja]=シンãƒãƒ©èªž -Name[ka]=სენეგáƒáƒšáƒ£áƒ ი -Name[kk]=Сингалша -Name[km]=ស៊ីងហាលីស -Name[ko]=ì‹ í• ë¼ì–´ -Name[lb]=Singhalesesch -Name[lt]=Sinhalų -Name[mk]=СинхалÑки -Name[mn]=Синхал -Name[nb]=Singalesisk -Name[nds]=Singaleesch -Name[ne]=सिङà¥à¤¹à¤¾à¤²à¥€ -Name[nl]=Sinhalees -Name[nn]=Singalesisk -Name[nso]=Se-Sinhalese -Name[pa]=ਸਿੰਹਾਲਸ਼ -Name[pl]=Syngaleski -Name[ro]=Sinaleză -Name[ru]=СингальÑкий -Name[rw]=Ikinyasinali -Name[se]=Singalesagiella -Name[sk]=sinhalÄina -Name[sl]=sinhalese -Name[sq]=Sinalezisht -Name[sr]=СинхалÑки -Name[sr@Latn]=Sinhalski -Name[ss]=Si-Sinhalese -Name[sv]=Singalesiska -Name[ta]=சிஙà¯à®•à®³à®®à¯ -Name[te]=సింహలీసౠ-Name[tg]=Сингалӣ -Name[th]=ภาษาสิงหล -Name[tt]=Sinhalçä -Name[uk]=СингальÑька -Name[uz]=Sinxalese -Name[uz@cyrillic]=СинхалеÑе -Name[vi]=Xin-ha-li -Name[wa]=Sinhalès -Name[zh_CN]=åƒ§ä¼½ç½—è¯ -Name[zh_HK]=錫è˜èªž -Name[zh_TW]=錫è˜èªž -Name[zu]=Isi-Sinhalese [sk] Name=Slovak -Name[af]=Slovakies -Name[ar]=السلوÙاكية -Name[az]=Slovakca -Name[be]=Ð¡Ð»Ð°Ð²Ð°Ñ†ÐºÐ°Ñ -Name[bg]=Словашки -Name[bn]=সà§à¦²à§‹à¦à¦¾à¦• -Name[br]=Sloveg -Name[bs]=SlovaÄki -Name[ca]=Eslovè -Name[cs]=Slovenský -Name[csb]=SÅ‚owacczi -Name[cy]=Sloveg -Name[da]=Slovakisk -Name[de]=Slowakisch -Name[el]=Σλοβακικά -Name[eo]=Slovaka -Name[es]=Eslovaco -Name[et]=Slovaki -Name[eu]=Eslovakiera -Name[fa]=اسلواکی -Name[fi]=Slovakki -Name[fr]=Slovaque -Name[fy]=Slovaaks -Name[ga]=Slóvaicis -Name[gl]=Eslovaco -Name[he]=×¡×œ×•×‘× ×™×ª -Name[hi]=सà¥à¤²à¥‹à¤µà¤¾à¤•à¤¨ -Name[hr]=SlovaÄki -Name[hsb]=SÅ‚owaksce -Name[hu]=Szlovák -Name[id]=Slovakia -Name[is]=Slóvenska -Name[it]=Slovacco -Name[ja]=スãƒãƒã‚ア語 -Name[ka]=სლáƒáƒ•áƒáƒ™áƒ£áƒ ი -Name[kk]=Словакша -Name[km]=ស្លូវ៉ាគី -Name[ko]=슬로바키아어 -Name[ku]=Slovakî -Name[lb]=Slowakesch -Name[lt]=Slovakų -Name[lv]=SlovÄku -Name[mk]=Словачки -Name[mn]=Словак -Name[mt]=Slovakk -Name[nb]=Slovakisk -Name[nds]=Slowaaksch -Name[ne]=सà¥à¤²à¥‹à¤à¤¾à¤• -Name[nl]=Slowaaks -Name[nn]=Slovakisk -Name[oc]=Eslòvac -Name[pa]=ਸਲੋਵਾਕ -Name[pl]=SÅ‚owacki -Name[pt]=Eslovaco -Name[pt_BR]=Eslovaco -Name[ro]=Slovacă -Name[ru]=Словацкий -Name[rw]=Igisilovake -Name[se]=Slovákagiella -Name[sk]=slovenÄina -Name[sl]=slovaÅ¡ko -Name[sq]=Sllovakisht -Name[sr]=Словачки -Name[sr@Latn]=SlovaÄki -Name[sv]=Slovakiska -Name[ta]=சà¯à®²à¯‹à®µà®¾à®•à¯ -Name[te]=à°¸à±à°²à±Šà°µà°¾à°•à± -Name[tg]=Словакӣ -Name[th]=ภาษาสโลวัค -Name[tr]=Slovakça -Name[tt]=Slovakça -Name[uk]=Словацька -Name[uz]=Slovakcha -Name[uz@cyrillic]=Словакча -Name[ven]=Musilovaka -Name[vi]=Xlô-vák -Name[wa]=Eslovake -Name[xh]=isiSlovak -Name[zh_CN]=斯洛ä¼å…‹è¯ -Name[zh_HK]=斯洛ä¼å…‹èªž -Name[zh_TW]=斯洛ä¼å…‹èªž -Name[zu]=Isi-Silovaki [sl] Name=Slovenian -Name[af]=Sloveniese -Name[ar]=السلوÙينية -Name[az]=SlovencÉ™ -Name[be]=СлавенÑÐºÐ°Ñ -Name[bg]=СловенÑки -Name[bn]=সà§à¦²à§‹à¦à§‡à¦¨à§€à§Ÿ -Name[br]=Slovenieg -Name[bs]=SlovenaÄki -Name[ca]=Eslovè -Name[cs]=Slovinský -Name[csb]=Slowensczi -Name[cy]=Sloveneg -Name[da]=Slovensk -Name[de]=Slowenisch -Name[el]=Σλοβενικά -Name[eo]=Slovena -Name[es]=Esloveno -Name[et]=Sloveeni -Name[eu]=Esloveniera -Name[fa]=اسلونیایی -Name[fi]=Sloveeni -Name[fr]=Slovène -Name[fy]=Sloveensk -Name[ga]=Slóivéinis -Name[gl]=Esloveno -Name[he]=×¡×œ×•×‘× ×™×ª -Name[hi]=सà¥à¤²à¥‹à¤µà¥‡à¤¨à¤¿à¤¯à¤¨ -Name[hr]=Slovenski -Name[hsb]=SÅ‚owjensce -Name[hu]=Szlovén -Name[id]=Slovenia -Name[is]=Slóvenska -Name[it]=Sloveno -Name[ja]=スãƒãƒ™ãƒ‹ã‚¢èªž -Name[ka]=სლáƒáƒ•áƒ”ნური -Name[kk]=Словенше -Name[km]=ស្លូវ៉ានី -Name[ko]=ìŠ¬ë¡œë² ë‹ˆì•„ì–´ -Name[ku]=Slovenî -Name[lb]=Slowenesch -Name[lt]=SlovÄ—nų -Name[lv]=Slovēņu -Name[mk]=Словенечки -Name[mn]=Словиан -Name[ms]=Slovenia -Name[mt]=Sloven -Name[nb]=Slovensk -Name[nds]=Sloweensch -Name[ne]=सà¥à¤²à¥‹à¤à¥‡à¤¨à¤¿à¤¯à¤¨ -Name[nl]=Sloweens -Name[nn]=Slovensk -Name[nso]=Se-Slovenian -Name[oc]=Eslòvian -Name[pa]=ਸਲੋਵੀਨੀਆਨ -Name[pl]=SÅ‚oweÅ„ski -Name[pt]=Esloveno -Name[pt_BR]=Esloveno -Name[ro]=Slovenă -Name[ru]=СловенÑкий -Name[rw]=Ikinyasiloveniya -Name[se]=Slovenagiella -Name[sk]=slovinÄina -Name[sl]=slovensko -Name[sq]=Sllovenisht -Name[sr]=Словеначки -Name[sr@Latn]=SlovenaÄki -Name[ss]=Si-Slovenian -Name[sv]=Slovenska -Name[ta]=சà¯à®²à¯‹à®µà¯€à®©à®¿à®¯à®©à¯ -Name[te]=à°¸à±à°²à±Šà°µà±‡à°¨à°¿à°¯à°¨à± -Name[tg]=Словенӣ -Name[th]=ภาษาสโลเวเนีย -Name[tr]=Slovence -Name[tt]=Slovençä -Name[uk]=СловенÑька -Name[uz]=Sloveniancha -Name[uz@cyrillic]=Словенианча -Name[vi]=Xlô-ven -Name[wa]=Eslovenyin -Name[zh_CN]=æ–¯æ´›æ–‡å°¼äºšè¯ -Name[zh_HK]=斯洛ç¶å°¼äºžèªž -Name[zh_TW]=斯洛ç¶å°¼äºžèªž -Name[zu]=Isi-Slovenian [sm] Name=Samoan -Name[ar]=الساموية -Name[be]=Самоа -Name[bg]=СамоанÑки -Name[bn]=সামোয়ান -Name[bs]=Samoanski -Name[ca]=Samoanès -Name[cs]=Samojský -Name[csb]=SamoaÅ„sczi -Name[cy]=Samoeg -Name[da]=Samoansk -Name[de]=Samoanisch -Name[el]=Σαμοανικά -Name[eo]=Samoa -Name[es]=Samoano -Name[et]=Samoa -Name[eu]=Samoera -Name[fa]=ساموان -Name[fi]=Samoa -Name[fy]=Samoaansk -Name[ga]=Samóis -Name[gl]=Samoano -Name[he]=סמו×ית -Name[hi]=सामोन -Name[hr]=Samoanski -Name[hsb]=Samoasce -Name[hu]=Szamoai -Name[id]=Samoa -Name[it]=Samoano -Name[ja]=サモア語 -Name[ka]=სáƒáƒ›áƒáƒ -Name[kk]=Самоа -Name[km]=សាមូអា -Name[ko]=사모아어 -Name[lb]=Samoanesch -Name[lt]=Samoa -Name[lv]=SamoieÅ¡u -Name[mk]=СамоанÑки -Name[mn]=Самоан -Name[nb]=Samoansk -Name[nds]=Samoaansch -Name[ne]=सामोआन -Name[nl]=Samoaans -Name[nn]=Samoansk -Name[nso]=Se-Samoan -Name[pa]=ਸਾਮੋਆਨ -Name[pl]=SamoaÅ„ski -Name[pt]=Samoano -Name[pt_BR]=Samoa -Name[ro]=Samoană -Name[ru]=Самоа -Name[rw]=Igisamowani -Name[se]=Samoagiella -Name[sk]=samojÄina -Name[sl]=samojsko -Name[sq]=Samonisht -Name[sr]=СамоанÑки -Name[sr@Latn]=Samoanski -Name[ss]=Si-Samoan -Name[sv]=Samoanska -Name[ta]=சமோவன௠-Name[te]=సమొవనౠ-Name[tg]=Самоанӣ -Name[th]=ภาษาซาโมน -Name[tt]=Samoaça -Name[uk]=СамоанÑька -Name[uz]=Samoacha -Name[uz@cyrillic]=Самоача -Name[vi]=Xa-mô-a -Name[wa]=Samowan -Name[zh_CN]=è¨æ‘©äºšè¯ -Name[zh_HK]=薩摩牙語 -Name[zh_TW]=薩摩牙語 -Name[zu]=Isi-Samoan [sn] Name=Shona -Name[ar]=الشونا -Name[be]=Шона -Name[bg]=Шона -Name[bn]=শোনা -Name[eo]=Åœona -Name[fa]=شوها -Name[fi]=Å¡ona -Name[ga]=Seoinis -Name[he]=×©×•× ×” -Name[hi]=शोना -Name[hu]=Sona -Name[ja]=ショナ語 -Name[ka]=შáƒáƒœáƒ -Name[kk]=Схона -Name[km]=សូណា -Name[ko]=쇼나어 -Name[mk]=Шона -Name[mn]=Шона -Name[nds]=Schona -Name[ne]=शोना -Name[nso]=Se-Shona -Name[pa]=ਸ਼ੋਨਾ -Name[ro]=Åžonă -Name[ru]=Схона -Name[rw]=Igishona -Name[se]=Å onagiella -Name[sk]=Å¡ona -Name[sl]=shona -Name[sq]=Shonisht -Name[sr]=ШонÑки -Name[sr@Latn]=Å onski -Name[ss]=SiShona -Name[ta]=ஷோனா -Name[te]=షొనా -Name[tg]=Шонӣ -Name[th]=ภาษาโชนา -Name[tt]=Åžonaça -Name[uk]=Шона -Name[uz@cyrillic]=Шона -Name[vi]=Sô-na -Name[xh]=Isishona -Name[zh_CN]=ä¿®çº³è¯ -Name[zh_HK]=Shona語 -Name[zh_TW]=Shona語 -Name[zu]=Isi-Shona [so] Name=Somali -Name[ar]=صومالي -Name[be]=СамалійÑÐºÐ°Ñ -Name[bg]=Сомали -Name[bn]=সোমালীয় -Name[br]=Somalieg -Name[bs]=Somalijski -Name[ca]=Somalà -Name[cs]=Somálský -Name[csb]=Somalijsczi -Name[da]=Somalisk -Name[el]=Σομαλικά -Name[eo]=Somala -Name[es]=Somalà -Name[et]=Somaali -Name[eu]=Somaliera -Name[fa]=سومالی -Name[fy]=Somalysk -Name[ga]=Somáilis -Name[he]=סומלית -Name[hi]=सोमाली -Name[hr]=Somalijski -Name[hsb]=Somalisce -Name[hu]=Szomáli -Name[id]=Somalia -Name[is]=Sómalska -Name[it]=Somalo -Name[ja]=ソマリ語 -Name[ka]=სáƒáƒ›áƒáƒšáƒ£áƒ ი -Name[kk]=Сомали -Name[km]=សូម៉ាលី -Name[ko]=소ë§ë¦¬ì•„ì–´ -Name[lb]=Somalesch -Name[lt]=SomalieÄių -Name[lv]=SomÄlieÅ¡u -Name[mk]=СомалиÑки -Name[mn]=Сомали -Name[ne]=सोमाली -Name[nl]=Somalisch -Name[nso]=Se-Somali -Name[pa]=ਸੋਮਾਲੀ -Name[pl]=Somalijski -Name[ro]=Somaleză -Name[ru]=СомалийÑкий -Name[rw]=Igisomali -Name[se]=Somálagiella -Name[sk]=somálÄina -Name[sl]=somalsko -Name[sq]=Somalisht -Name[sr]=СомалијÑки -Name[sr@Latn]=Somalijski -Name[ss]=Si-Somali -Name[ta]=சோமாலி -Name[te]=సొమాలి -Name[tg]=Сомалӣ -Name[th]=ภาษาโซมาลี -Name[tt]=Somaliçä -Name[uk]=СомалійÑька -Name[uz]=Somalicha -Name[uz@cyrillic]=Сомалича -Name[vi]=Xô-ma-li -Name[wa]=Somalyin -Name[zh_CN]=ç´¢é©¬é‡Œè¯ -Name[zh_HK]=索馬利語 -Name[zh_TW]=索馬利語 -Name[zu]=Isi-Somali [sq] Name=Albanian -Name[af]=Albanees -Name[ar]=ألباني -Name[az]=Albanca -Name[be]=ÐлбанÑÐºÐ°Ñ -Name[bg]=ÐлбанÑки -Name[bn]=আলবেনীয় -Name[br]=Albanieg -Name[bs]=Albanski -Name[ca]=Albanès -Name[cs]=Albánský -Name[csb]=AlbaÅ„sczi -Name[cy]=Albaneg -Name[da]=Albansk -Name[de]=Albanisch -Name[el]=Αλβανικά -Name[eo]=Albana -Name[es]=Albanés -Name[et]=Albaania -Name[eu]=Albaniera -Name[fa]=آلبانی -Name[fi]=Albania -Name[fr]=Albanais -Name[fy]=Albaansk -Name[ga]=Albáinis -Name[gl]=Albanés -Name[he]=××œ×‘× ×™×ª -Name[hi]=अलà¥à¤¬à¤¾à¤¨à¤¿à¤¯à¤¨ -Name[hr]=Albanski -Name[hsb]=Albansce -Name[hu]=Albán -Name[id]=Albania -Name[is]=Albanskur -Name[it]=Albanese -Name[ja]=アルãƒãƒ‹ã‚¢èªž -Name[ka]=áƒáƒšáƒ‘áƒáƒœáƒ£áƒ ი -Name[kk]=Ðлбанша -Name[km]=អាល់បានី -Name[ko]=알바니아어 -Name[ku]=Albanî -Name[lb]=Albanesch -Name[lt]=Albanų -Name[lv]=AlbÄņu -Name[mk]=ÐлбанÑки -Name[mn]=Ðлбани -Name[ms]=Albania -Name[nb]=Albansk -Name[nds]=Albaansch -Name[ne]=अलà¥à¤¬à¤¾à¤¨à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Albanisch -Name[nn]=Albansk -Name[nso]=Se-Albanian -Name[pa]=ਅਲਬਾਨੀਅਨ -Name[pl]=AlbaÅ„ski -Name[pt]=Albanês -Name[pt_BR]=Albanês -Name[ro]=Albaneză -Name[ru]=ÐлбанÑкий -Name[rw]=Ikinyalubaniya -Name[se]=Albániagiella -Name[sk]=albánÄina -Name[sl]=albansko -Name[sq]=Shqip -Name[sr]=ÐлбанÑки -Name[sr@Latn]=Albanski -Name[ss]=Si-Albanian -Name[sv]=Albanska -Name[ta]=அலà¯à®ªà¯‡à®©à®¿à®¯à®©à¯ -Name[te]=à°…à°²à±à°¬à±‡à°¨à°¿à°¯à°¨à± -Name[tg]=Ðлбанӣ -Name[th]=ภาษาà¸à¸±à¸¥à¹€à¸šà¹€à¸™à¸µà¸¢ -Name[tt]=Albança -Name[uk]=ÐлбанÑька -Name[uz]=Albancha -Name[uz@cyrillic]=Ðлбанча -Name[vi]=An-ba-ni -Name[wa]=Albanyin -Name[zh_CN]=é˜¿å°”å·´å°¼äºšè¯ -Name[zh_HK]=阿爾巴尼亞語 -Name[zh_TW]=阿爾巴尼亞語 -Name[zu]=Isi-Albanian [sr] Name=Serbian -Name[af]=Serbiese -Name[ar]=الصربية -Name[az]=SerbcÉ™ -Name[be]=СербÑÐºÐ°Ñ -Name[bg]=СръбÑки -Name[bn]=সারà§à¦¬à§€à§Ÿ -Name[br]=Serbeg -Name[bs]=Srpski -Name[ca]=Serbi -Name[cs]=Srbský -Name[csb]=Serbsczi -Name[cy]=Serbieg -Name[da]=Serbisk -Name[de]=Serbisch -Name[el]=ΣεÏβικά -Name[eo]=Serba -Name[es]=Serbio -Name[et]=Serbia -Name[eu]=Serbiera -Name[fa]=صربستانی -Name[fi]=Serbia -Name[fr]=Serbe -Name[fy]=Servysk -Name[ga]=Seirbis -Name[gl]=Sérvio -Name[he]=סרבית -Name[hi]=सरà¥à¤¬à¤¿à¤¯à¤¨ -Name[hr]=Srpski -Name[hsb]=Serbisce -Name[hu]=Szerb -Name[id]=Serbia -Name[is]=Serbneska -Name[it]=Serbo -Name[ja]=セルビア語 -Name[ka]=სერბული -Name[kk]=Сербше -Name[km]=សែប៊ី -Name[ko]=세르비아어 -Name[ku]=Sirbî -Name[lb]=Serbesch -Name[lt]=Serbų -Name[lv]=Serbu -Name[mk]=СрпÑки -Name[mn]=Серб -Name[ms]=Serbia -Name[mt]=Serb -Name[nb]=Serbisk -Name[nds]=Serbsch -Name[ne]=सरà¥à¤¬à¤¿à¤¯à¤¾à¤²à¥€ -Name[nl]=Servisch -Name[nn]=Serbisk -Name[nso]=Se-Serbian -Name[pa]=ਸਰਬੀਅਨ -Name[pl]=Serbski -Name[pt]=Sérvio -Name[pt_BR]=Sérvio -Name[ro]=Sîrbă -Name[ru]=СербÑкий -Name[rw]=Ikinyaseribiya -Name[se]=Serbiagiella -Name[sk]=srbÄina -Name[sl]=srbsko -Name[sq]=Serbisht -Name[sr]=СрпÑки -Name[sr@Latn]=Srpski -Name[ss]=Si-Serbian -Name[sv]=Serbiska -Name[ta]=செரà¯à®ªà®¿à®¯à®©à¯ -Name[te]=సెరà±à°¬à°¿à°¯à°¨à± -Name[tg]=Сербӣ -Name[th]=ภาษาเซà¸à¸£à¹Œà¹€à¸šà¸µà¸¢ -Name[tr]=Sırpça -Name[tt]=Serbçä -Name[uk]=СербÑька -Name[uz]=Serbcha -Name[uz@cyrillic]=Сербча -Name[vi]=Xéc-bi -Name[wa]=Serbe -Name[zh_CN]=å¡žå°”ç»´äºšè¯ -Name[zh_HK]=塞爾ç¶äºžèªž -Name[zh_TW]=塞爾ç¶äºžèªž -Name[zu]=Isi-Serbian [sr@Latn] Name=Serbian Latin -Name[be]=СербÑÐºÐ°Ñ (лацініца) -Name[bg]=СръбÑки латинÑки -Name[br]=Serbeg latin -Name[bs]=Srpski latinica -Name[ca]=Serbi llatà -Name[cs]=Srbský (latinka) -Name[csb]=Serbsczi (Å‚acëńsczi) -Name[cy]=Serbieg Lladin -Name[da]=Serbisk latin -Name[de]=Serbisch (lat. Alphabet) -Name[el]=ΣεÏβικά (Λατινικά) -Name[eo]=Serba Latina alfabeto -Name[es]=LatÃn Serbio -Name[et]=Serbia (ladina) -Name[eu]=Serbiera (Latina) -Name[fa]=صربستانی -Name[fi]=Serbian latina -Name[fr]=Serbe Latin -Name[fy]=Servysk Latijnsk -Name[ga]=Seirbis (aibÃtir Laidineach) -Name[gl]=Sérbio Latino -Name[he]=×œ×˜×™× ×™×ª סרבית -Name[hr]=Srpski latinica -Name[hu]=Szerb (latin betűs) -Name[is]=Serbnesk latÃna -Name[it]=Serbo latino -Name[ja]=セルビア語 (ラテン文å—) -Name[ka]=სერბული ლáƒáƒ—ინური -Name[kk]=Сербше (Латын) -Name[km]=សែប៊ី (ឡាážáž¶áŸ†áž„) -Name[ku]=Sirbiya Latînî -Name[lb]=Latäinescht Serbesch -Name[lt]=Serbų lotynų -Name[lv]=Serbu latīņu -Name[mk]=СрпÑки (латиница) -Name[ms]=Latin Serbia -Name[nb]=Serbisk (latinsk) -Name[nds]=Serbsch (latiensch Schrift) -Name[ne]=सरà¥à¤¬à¤¿à¤¯à¤¾à¤²à¥€ लà¥à¤¯à¤¾à¤Ÿà¤¿à¤¨ -Name[nl]=Servisch Latijn -Name[nn]=Serbisk, latinsk -Name[pa]=ਸਰਬੀਅਨ ਲੈਟਿਨ -Name[pl]=Serbski Å‚aciÅ„ski -Name[pt]=Sérvio Latino -Name[pt_BR]=Sérvio Latino -Name[ro]=Sîrbă latină -Name[ru]=СербÑкий латинницей -Name[se]=SerbialaÅ¡ latiidnagiella -Name[sk]=srbÄina (latinka) -Name[sl]=srbsko latinsko -Name[sr]=СрпÑки латинични -Name[sr@Latn]=Srpski latiniÄni -Name[sv]=Latinsk serbiska -Name[te]=సెరà±à°¬à°¿à°¯à°¨à± లాటినౠ-Name[tg]=Лотини СербиÑвӣ -Name[th]=ภาษาละตินเซà¸à¸£à¹Œà¹€à¸šà¸µà¸¢ -Name[tr]=Sırpça Latin -Name[uk]=СербÑька (латинь) -Name[uz]=Serbcha (Lotin) -Name[uz@cyrillic]=Сербча (Лотин) -Name[vi]=Xéc-bi (La-tinh) -Name[wa]=Siebe (alfabet latén) -Name[zh_CN]=塞尔维亚è¯(拉ä¸) -Name[zh_TW]=賽爾ç¶äºžæ‹‰ä¸èªž [ss] Name=Swati -Name[ar]=السواتي -Name[az]=Svati -Name[be]=Сваці -Name[bg]=Суази -Name[bn]=সোয়াতি -Name[et]=Svaasi -Name[fa]=سواتی -Name[fi]=Swazi -Name[ga]=Sasuatais -Name[he]=סוו×טי -Name[hi]=सà¥à¤µà¤¾à¤¤à¥€ -Name[hu]=Szvati -Name[ja]=スワティ語 -Name[ka]=სვáƒáƒ¢áƒ˜ -Name[kk]=Свати -Name[km]=ស្វាទី -Name[ko]=스와티어 -Name[lb]=Swazi -Name[mk]=Свати -Name[mn]=Свати -Name[ne]=सà¥à¤µà¤¾à¤¤à¥€ -Name[nso]=Se-Swati -Name[pa]=ਸਵਾਟੀ -Name[ro]=Suată -Name[ru]=Свати -Name[rw]=Igiswati -Name[se]=Svatigiella -Name[sk]=swati -Name[sl]=swati -Name[sq]=Suatisht -Name[sr]=Свати -Name[sr@Latn]=Svati -Name[ss]=SiSwati -Name[sv]=Swazi -Name[ta]=சà¯à®µà®¾à®¤à®¿ -Name[te]=à°¸à±à°µà°¾à°¤à°¿ -Name[tg]=Сватӣ -Name[th]=ภาษาสวาตี -Name[tt]=Swatça -Name[uk]=Суаті -Name[uz]=Svati -Name[uz@cyrillic]=Свати -Name[vi]=Xouă-ti -Name[wa]=Suwati -Name[xh]=Isiswati -Name[zh_CN]=æ–¯ç“¦ç‰¹è¯ -Name[zh_HK]=Swati語 -Name[zh_TW]=Swati語 -Name[zu]=Isi-Swati [st] Name=Sotho, Southern -Name[af]=Sotho, Suid -Name[ar]=السوتو الشمالية -Name[az]=Sotho, CÉ™nubi -Name[be]=Сота (поўдзень) -Name[bg]=Южен Сото -Name[bn]=সোথো, দকà§à¦·à¦¿à¦£ -Name[br]=Soto, Su -Name[bs]=Soto, Južni -Name[ca]=Sotho del sud -Name[cs]=Sotho, Jižnà -Name[csb]=Sotho, Pôłniowi -Name[cy]=Sotho, De -Name[da]=Sotho, syd -Name[de]=Südliches Sotho -Name[eo]=Suda Sota -Name[es]=Sotho del sur -Name[et]=Lõuna-sotho -Name[eu]=Sothoera (egoaldekoa) -Name[fa]=سوتوی جنوبی -Name[fi]=Sotho -Name[fr]=Sotho du Sud -Name[fy]=Sotho, Súd -Name[ga]=Sótó Theas -Name[gl]=Sotho do sur -Name[he]=סותו דרומית -Name[hi]=सोथो, दकà¥à¤·à¤¿à¤£à¥€ -Name[hr]=Sotho, Južni -Name[hsb]=Sotho (juh) -Name[hu]=Sotho (déli) -Name[is]=Sotho, suður -Name[it]=Sotho meridionale -Name[ja]=å—ソト語 -Name[ka]=სáƒáƒ›áƒ®áƒ ეთ სáƒáƒ¢áƒ -Name[kk]=ОңтүÑтік Ñото -Name[km]=សូធូ​ážáž¶áž„​ážáŸ’បូង -Name[ko]=남부 ì†Œí† ì–´ -Name[lb]=Südlecht Sotho -Name[lt]=Sotho, Pietų -Name[mk]=Сото, јужен -Name[mn]=Сото, Өмнөд -Name[ms]=Sotho, Selatan -Name[nb]=Sotho, Sørlig -Name[nds]=Sotho, Sööd -Name[ne]=सोथो, दकà¥à¤·à¤¿à¤£à¥€ -Name[nl]=Sotho, Zuid -Name[nn]=Sotho, sør -Name[nso]=Sesotho, sa Borwa -Name[pa]=ਸੋਥੋ, ਦੱਖਣੀ -Name[pl]=Sotho, PoÅ‚udniowy -Name[pt]=Sotho do Sul -Name[pt_BR]=Sotho, Sul -Name[ro]=Soto sudică -Name[ru]=Юж. Сото -Name[rw]=Igisotho, Amajyepfo -Name[se]=Sothogiella, lulli -Name[sk]=južná sothÄina -Name[sl]=sotho, južni -Name[sq]=Sothe Jugore -Name[sr]=Сото, јужни -Name[sr@Latn]=Soto, južni -Name[ss]=SiSotho, saseningizimo -Name[sv]=Sydsotho -Name[ta]=சோதà¯à®¤à¯‹, தென௠-Name[te]=సోతొ, దకà±à°·à°¿à°£ -Name[th]=ภาษาโซโธ ตà¸à¸™à¹ƒà¸•à¹‰ -Name[tt]=Sothoça, Könyaq -Name[uk]=Сото, Південна -Name[uz]=Sotxo, Janubiy -Name[uz@cyrillic]=Сотхо, Жанубий -Name[ven]=Sotho, Tshipembe -Name[vi]=Xô-tô (nam) -Name[wa]=Soto (nonne) -Name[xh]=Isisuthu, Sasemzantsi -Name[zh_CN]=索托，å—部 -Name[zh_HK]=æ¢æ‰˜èªžï¼Œå—部 -Name[zh_TW]=æ¢æ‰˜èªžï¼Œå—部 -Name[zu]=Isi-Suthu, Sase-Mzantsi [su] Name=Sundanese -Name[ar]=سوداني -Name[az]=Sundanca -Name[be]=СунданÑÐºÐ°Ñ -Name[bg]=СунданÑки -Name[bn]=সà§à¦¨à§à¦¦à¦¾à¦¨à¦¿à¦œ -Name[br]=Soudaneg -Name[bs]=SundaneÅ¡ki -Name[ca]=Sundanès -Name[cs]=Sundanský -Name[csb]=SudaÅ„sczi -Name[cy]=Sundaneg -Name[da]=Sundansk -Name[de]=Sundanesisch -Name[eo]=Sunda -Name[es]=Sudanés -Name[et]=Sunda -Name[eu]=Sundanera -Name[fa]=ساندانیز -Name[fi]=Sunda -Name[fr]=Soudanais -Name[fy]=Soendaneesk -Name[ga]=Sundais -Name[gl]=Sundanés -Name[he]=×¡×•×“× ×™×ª -Name[hi]=सूडानी -Name[hsb]=Sundanesce -Name[hu]=Szundanéz -Name[id]=Sunda -Name[it]=Sudanese -Name[ja]=スンダ語 -Name[ka]=სუდáƒáƒœáƒ£áƒ ი -Name[kk]=Суданша -Name[km]=ស៊ូដង់ -Name[ko]=수단어 -Name[lb]=Sudanesesch -Name[lt]=SudanieÄių -Name[lv]=SudÄnieÅ¡u -Name[mk]=СунданÑки -Name[mn]=Сундан -Name[nb]=Sundanesisk -Name[nds]=Sundaneesch -Name[ne]=सà¥à¤¡à¤¾à¤¨à¥€ -Name[nl]=Sundanees -Name[nn]=Sundanesisk -Name[nso]=Se-Sundan -Name[pa]=ਸੂਡਾਨੀਅਸ -Name[pl]=SudaÅ„ski -Name[pt]=Sudanês -Name[pt_BR]=Sudanês -Name[ro]=Sudaneză -Name[ru]=СуданÑкий -Name[rw]=Ikinyasundani -Name[se]=Sundanesagiella -Name[sk]=sundÄina -Name[sl]=sudansko -Name[sq]=Sundanezisht -Name[sr]=СунданÑки -Name[sr@Latn]=Sundanski -Name[ss]=Si-Sundanese -Name[sv]=Sundanesiska -Name[ta]=சூடானீஸ௠-Name[te]=సనà±à°¦à°¨à±€à°¸à± -Name[tg]=Санданизӣ -Name[th]=ภาษาซูดาน -Name[tt]=Sundanesçä -Name[uk]=СунданÑька -Name[uz]=Sundancha -Name[uz@cyrillic]=Сунданча -Name[vi]=Xun-Ä‘a-ni -Name[wa]=Soudanès -Name[zh_CN]=å·½ä»–è¯ -Name[zh_HK]=Sundanese語 -Name[zh_TW]=Sundanese語 -Name[zu]=Isi-Sundanese [sv] Name=Swedish -Name[af]=Sweeds -Name[ar]=السويدية -Name[az]=Ä°sveçcÉ™ -Name[be]=ШведÑÐºÐ°Ñ -Name[bg]=ШведÑки -Name[bn]=সà§à¦‡à¦¡à¦¿à¦¶ -Name[br]=Svedeg -Name[bs]=Å vedski -Name[ca]=Suec -Name[cs]=Å védský -Name[csb]=Szwedzczi -Name[cy]=Swedeg -Name[da]=Svensk -Name[de]=Schwedisch -Name[el]=Σουηδικά -Name[eo]=Sveda -Name[es]=Sueco -Name[et]=Rootsi -Name[eu]=Suediera -Name[fa]=سوئدی -Name[fi]=Ruotsi -Name[fr]=Suédois -Name[fy]=Sweedsk -Name[ga]=Sualainnis -Name[gl]=Sueco -Name[he]=שבדית -Name[hi]=सà¥à¤µà¥€à¤¡à¤¿à¤¶ -Name[hr]=Å vedski -Name[hsb]=Å wedsce -Name[hu]=Svéd -Name[id]=Swedia -Name[is]=Sænska -Name[it]=Svedese -Name[ja]=スウェーデン語 -Name[ka]=შვედური -Name[kk]=Шведше -Name[km]=ស៊ុយអែដ -Name[ko]=스웨ë´ì–´ -Name[ku]=Swêdî -Name[lb]=Schwedesch -Name[lt]=Å vedų -Name[lv]=Zviedru -Name[mi]=Reo Wïtana -Name[mk]=ШведÑки -Name[mn]=Швед -Name[mt]=Svediż -Name[nb]=Svensk -Name[nds]=Sweedsch -Name[ne]=सà¥à¤µà¤¿à¤¡à¥‡à¤¨à¥€ -Name[nl]=Zweeds -Name[nn]=Svensk -Name[nso]=Se-Swedish -Name[oc]=Suedès -Name[pa]=ਸਵੀਡਿਸ਼ -Name[pl]=Szwedzki -Name[pt]=Sueco -Name[pt_BR]=Sueco -Name[ro]=Suedeză -Name[ru]=ШведÑкий -Name[rw]=Ikinyasuwede -Name[se]=Ruoŧagiella -Name[sk]=Å¡védÄina -Name[sl]=Å¡vedsko -Name[sq]=Suedisht -Name[sr]=ШведÑки -Name[sr@Latn]=Å vedski -Name[ss]=SiSwidi -Name[sv]=Svenska -Name[ta]=சà¯à®µà¯€à®Ÿà®¿à®·à¯ -Name[te]=à°¸à±à°µà±€à°¡à°¿à°·à± -Name[tg]=Шведӣ -Name[th]=ภาษาสวีดิช -Name[tr]=Ä°sveççe -Name[tt]=Ä°swäcçä -Name[uk]=ШведÑька -Name[uz]=Shvedcha -Name[uz@cyrillic]=Шведча -Name[vi]=Thuỵ-Ä‘iển -Name[wa]=Suwedwès -Name[zh_CN]=ç‘žå…¸è¯ -Name[zh_HK]=瑞典語 -Name[zh_TW]=瑞典語 -Name[zu]=Isi-Swidishi [sw] Name=Swahili -Name[ar]=سواØلي -Name[az]=SvahilcÉ™ -Name[be]=Суахілі -Name[bg]=Суахили -Name[bn]=সোয়াহিলি -Name[ca]=Suahili -Name[cs]=Svahilský -Name[de]=Suaheli -Name[el]=Σουαχίλι -Name[eo]=Svahila -Name[es]=Suahili -Name[et]=Suahiili -Name[eu]=Swahiliera -Name[fa]=سواهیلی -Name[ga]=SvahaÃlis -Name[he]=סוו×הילי -Name[hi]=सà¥à¤µà¤¾à¤¹à¤¿à¤²à¥€ -Name[hr]=Svahili -Name[hu]=Szvahili -Name[ja]=スワヒリ語 -Name[ka]=სუáƒáƒ°áƒ˜áƒšáƒ˜ -Name[kk]=Суахили -Name[km]=ស្វាហ៊ីលី -Name[ko]=스와ížë¦¬ì–´ -Name[lt]=Suahili -Name[lv]=Svahili -Name[mk]=Свахили -Name[mn]=Свахил -Name[ne]=सà¥à¤µà¤¾à¤¹à¤¿à¤²à¥€ -Name[nso]=Se-Swahili -Name[pa]=ਸਵਾਹਿਲੀ -Name[ro]=Suahileză -Name[ru]=Суахили -Name[rw]=Igiswayili -Name[se]=Svahilagiella -Name[sk]=svahilÄina -Name[sl]=svahili -Name[sq]=Suailisht -Name[sr]=Свахили -Name[sr@Latn]=Svahili -Name[ss]=SiSwahili -Name[ta]=ஸà¯à®µà®¾à®¹à®¿à®²à®¿ -Name[te]=à°¸à±à°µà°¾à°¹à°¿à°²à°¿ -Name[tg]=Свахили -Name[th]=ภาษาสวาฮิลี -Name[tt]=Swahiliçä -Name[uk]=Суахілі -Name[uz]=Svaxili -Name[uz@cyrillic]=Свахили -Name[vi]=Xouă-hi-li -Name[wa]=Suwahili -Name[zh_CN]=æ–¯ç“¦å¸Œé‡Œè¯ -Name[zh_HK]=æ–¯è¯è¥¿é‡Œèªž -Name[zh_TW]=æ–¯è¯è¥¿é‡Œèªž -Name[zu]=Isi-Swahili [ta] Name=Tamil -Name[af]=Tamilies -Name[ar]=التاميلية -Name[az]=Tamil Dili -Name[be]=ТамільÑÐºÐ°Ñ -Name[bg]=ТамилÑки -Name[bn]=তামিল -Name[br]=Tamouleg -Name[bs]=Tamilski -Name[ca]=Tà mil -Name[cs]=Tamilský -Name[csb]=Tamilsczi -Name[da]=Tamilsk -Name[eo]=Tamila -Name[et]=Tamili -Name[eu]=Tamilera -Name[fa]=تامیل -Name[fi]=Tamili -Name[fr]=Tamoul -Name[ga]=Tamailis -Name[he]=טמילית -Name[hi]=तमिल -Name[hr]=Tamilski -Name[hsb]=Tamilsce -Name[is]=TamÃlska -Name[ja]=タミル語 -Name[ka]=თáƒáƒ›áƒ˜áƒšáƒ£áƒ ი -Name[kk]=Тамилша -Name[km]=ážáž¶áž˜áž¸áž› -Name[ko]=타밀어 -Name[lt]=Tamilų -Name[lv]=Tamilu -Name[mi]=Reo Ãnia tonga -Name[mk]=ТамилÑки -Name[mn]=Тамил -Name[nds]=Tamielsch -Name[ne]=तामिल -Name[nn]=Tamilsk -Name[nso]=Se-Tamil -Name[pa]=ਤਾਮਿਲ -Name[pl]=Tamiljski -Name[ro]=Tamilă -Name[ru]=ТамильÑкий -Name[rw]=Igitamili -Name[se]=Tamilgiella -Name[sk]=tamilÄina -Name[sl]=tamilsko -Name[sq]=Tamilisht -Name[sr]=ТамилÑки -Name[sr@Latn]=Tamilski -Name[ss]=Si-Tamil -Name[ta]=தமிழ௠-Name[te]=తమిళం -Name[tg]=Тамилӣ -Name[th]=ภาษาทมิฬ -Name[tr]=Tamil Dili -Name[tt]=Tamilça -Name[uk]=ТамільÑька -Name[uz]=Tamilcha -Name[uz@cyrillic]=Тамилча -Name[vi]=Ta-min -Name[wa]=Tamoul -Name[zh_CN]=æ³°ç±³å°”è¯ -Name[zh_HK]=å¦ç±³çˆ¾èªž -Name[zh_TW]=å¦ç±³çˆ¾èªž -Name[zu]=Isi-Tamili [te] Name=Telugu -Name[ar]=التيلوغو -Name[az]=Teluguca -Name[be]=ТÑлугу -Name[bg]=Телугу -Name[bn]=তেলেগৠ-Name[br]=Telegu -Name[eo]=Telugua -Name[fa]=تلوگو -Name[fr]=Télougou -Name[fy]=Telûgû -Name[ga]=Teileagúis -Name[he]=טלוגו -Name[hi]=तेलà¥à¤—ॠ-Name[ja]=テルグ語 -Name[ka]=ტელუგუ -Name[kk]=Телугу -Name[km]=ážáŸáž›áž¼áž ្គូ -Name[ko]=테루그어 -Name[mk]=Телугу -Name[mn]=ТÑлүгү -Name[ne]=तेलà¥à¤—ॠ-Name[nso]=Se-Telugu -Name[pa]=ਤੇਲਗੂ -Name[ro]=Telugă -Name[ru]=Телугу -Name[rw]=Igitelugu -Name[se]=Telugugiella -Name[sk]=telugÄina -Name[sl]=telugu -Name[sq]=Talugisht -Name[sr]=ТелугÑки -Name[sr@Latn]=Telugski -Name[ss]=Si-Telugu -Name[ta]=தெலà¯à®™à¯à®•à¯ -Name[te]=తెలà±à°—à± -Name[tg]=ТелугуÑгӣ -Name[th]=ภาษาเตลูà¸à¸¹ -Name[tt]=Teluguça -Name[uk]=Телугу -Name[uz@cyrillic]=Телугу -Name[vi]=Te-lu-gu -Name[wa]=Telougou -Name[zh_CN]=æ³°å¢å›ºè¯ -Name[zh_HK]=特拉å¤èªž -Name[zh_TW]=特拉å¤èªž -Name[zu]=Isi-Telugu [tg] Name=Tajik -Name[af]=Tajikees -Name[ar]=طاجيكي -Name[az]=TacikcÉ™ -Name[be]=Ð¢Ð°Ð´Ð¶Ñ‹Ñ†ÐºÐ°Ñ -Name[bg]=ТаджикÑки -Name[bn]=তাজিক -Name[br]=Tajiek -Name[bs]=TadžiÄki -Name[cs]=Tádžikský -Name[csb]=Tadżëcczi -Name[de]=Tadschikisch -Name[el]=Τατζικικά -Name[eo]=TaÄika -Name[es]=Tayiko -Name[et]=Tadžiki -Name[eu]=Tadjikera -Name[fa]=تاجیک -Name[fi]=Tadžikki -Name[fr]=Tadjik -Name[fy]=Tadzjyksk -Name[ga]=TáidsÃcis -Name[gl]=Taxico -Name[he]=טג'יקית -Name[hi]=ताजिक -Name[hr]=Tadžik -Name[hsb]=Tadźikisce -Name[hu]=Tadzsik -Name[it]=Tagicco -Name[ja]=タジク語 -Name[ka]=ტáƒáƒ¯áƒ˜áƒ™áƒ£áƒ ი -Name[kk]=Тәжікше -Name[km]=ážáž¶ážŠáž ្ស៊ីគីស្ážáž„់ -Name[ko]=타ì§ì–´ -Name[lb]=Tadschikesch -Name[lt]=Tadžikų -Name[lv]=Tadžiku -Name[mk]=ТаџикиÑтанÑки -Name[mn]=Тажик -Name[nb]=Tadsjikisk -Name[nds]=Tadschiiksch -Name[ne]=ताजिक -Name[nl]=Tajiks -Name[nn]=Tadsjikisk -Name[nso]=Se-Tajik -Name[pa]=ਤਾਜਿਕ -Name[pl]=Tadżycki -Name[ro]=Tajică -Name[ru]=ТаджикÑкий -Name[rw]=Igitajika -Name[se]=Tažihkagiella -Name[sk]=tadžiÄtina -Name[sl]=tadžiÅ¡ko -Name[sq]=Taxhikisht -Name[sr]=ТаџикиÑтанÑки -Name[sr@Latn]=Tadžikistanski -Name[ss]=Si-Tajik -Name[sv]=Tadzjikiska -Name[ta]=தஜிக௠-Name[te]=తాజికౠ-Name[tg]=Тоҷикӣ -Name[th]=ภาษาทาจิà¸à¸´à¸ªà¸–าน -Name[tt]=Tajıqça -Name[uk]=Таджицька -Name[uz]=Tojikcha -Name[uz@cyrillic]=Тожикча -Name[vi]=Ta-gÃc -Name[wa]=Tadjik -Name[zh_CN]=å¡”å‰å…‹è¯ -Name[zh_HK]=å¡”å‰å…‹èªž -Name[zh_TW]=å¡”å‰å…‹èªž -Name[zu]=Isi-Tajik [th] Name=Thai -Name[af]=Thaïs -Name[ar]=التايلاندية -Name[az]=Tayca -Name[be]=ТайÑÐºÐ°Ñ -Name[bg]=ТайÑки -Name[bn]=থাই -Name[br]=Tailh -Name[bs]=Tajlandski -Name[cs]=Thajský -Name[csb]=Tajsczi -Name[da]=Thailandsk -Name[el]=Ταϊλανδικά -Name[eo]=Taja -Name[es]=Tailandés -Name[et]=Tai -Name[eu]=Thailandiera -Name[fa]=تایلندی -Name[fr]=Thaïlandais -Name[fy]=Taaisk -Name[ga]=Téalainnis -Name[gl]=Tailandés -Name[he]=ת××™×œ× ×“×™×ª -Name[hi]=थाई -Name[hr]=Tajlandski -Name[hsb]=Taisce -Name[id]=Thailand -Name[is]=Tælenska -Name[it]=Thailandese -Name[ja]=タイ語 -Name[ka]=ტáƒáƒ˜ -Name[kk]=Тайша -Name[km]=ážáŸƒ -Name[ko]=타ì´ì–´ -Name[ku]=Tay -Name[lt]=TailandieÄių -Name[lv]=TaizemieÅ¡u -Name[mk]=ТајландÑки -Name[mn]=Тай -Name[mt]=Tai -Name[ne]=थाई -Name[nl]=Thais -Name[nn]=Thailandsk -Name[nso]=Se-Thai -Name[oc]=Tai -Name[pa]=ਥਾਈ -Name[pl]=Tajski -Name[pt]=Tailandês -Name[ro]=Tailandeză -Name[ru]=ТайÑкий -Name[rw]=Igitayi -Name[se]=Thaigiella -Name[sk]=thajÄina -Name[sl]=tajsko -Name[sq]=Tajlandisht -Name[sr]=ТајландÑки -Name[sr@Latn]=Tajlandski -Name[ss]=Si-Thai -Name[sv]=Thailändska -Name[ta]=தாய௠-Name[te]=థాయి -Name[tg]=Тайландӣ -Name[th]=ภาษาไทย -Name[tt]=Tayça -Name[uk]=ТайÑька -Name[uz]=Taycha -Name[uz@cyrillic]=Тайча -Name[vi]=Thái -Name[wa]=Taylandès -Name[zh_CN]=æ³°è¯ -Name[zh_HK]=泰國語 -Name[zh_TW]=泰國語 -Name[zu]=Isi-Thayi [ti] Name=Tigrinya -Name[ar]=التيغرينيا -Name[az]=Tigrinyaca -Name[be]=Ð¢Ñ‹Ð³Ñ€Ñ‹Ð½ÑŒÑ -Name[bg]=Ð¢Ð¸Ð³Ñ€Ð¸Ð½Ñ -Name[bn]=টিগà§à¦°à¦¿à¦¨à§à¦¯à¦¾ -Name[de]=Tigrinja -Name[eo]=Tigraja -Name[et]=Tigrinja -Name[fa]=تیگرینیا -Name[fi]=Tigrinja -Name[fr]=Tigrigna -Name[fy]=Tigrysk -Name[ga]=Tigrinis -Name[gl]=Tigrignan -Name[he]=×˜×™×’×¨×™× ×™×” -Name[hi]=टिगà¥à¤°à¤¿à¤¨à¥à¤¯à¤¾ -Name[hsb]=Tigrinja -Name[hu]=Tigrinja -Name[ja]=ティグリニア語 -Name[ka]=ტიგრინირ-Name[kk]=Ð¢Ð¸Ð³Ñ€Ð¸Ð½ÑŒÑ -Name[km]=ទីក្រីនយ៉ា -Name[ko]=티그리ëƒì–´ -Name[lb]=Tigrinja-Sprooch -Name[mk]=Тигринја -Name[mn]=Тигрин -Name[ne]=तिगà¥à¤°à¤¿à¤¨à¥à¤¯ -Name[nn]=Tigrinja -Name[nso]=Se-Tigrinya -Name[pa]=ਤਿਗਰੀਅਨ -Name[ro]=Tigrină -Name[ru]=Ð¢Ð¸Ð³Ñ€Ð¸Ð½ÑŒÑ -Name[rw]=Igitigirinya -Name[se]=Tigrinjágiella -Name[sk]=tigriňa -Name[sl]=tigrinya -Name[sq]=Tigrinjisht -Name[sr]=ТигринÑки -Name[sr@Latn]=Tigrinski -Name[ss]=Si-Tigrinya -Name[sv]=Tigrinja -Name[ta]=திகிரினà¯à®¯à®¾ -Name[te]=à°Ÿà°¿à°—à±à°°à°¿à°¨à±à°¯à°¾ -Name[tg]=ТигринÑгӣ -Name[th]=ภาษาทิà¸à¸£à¸´à¸™à¸¢à¸² -Name[tt]=Tigrinyaça -Name[uk]=ТигринійÑька -Name[uz@cyrillic]=Ð¢Ð¸Ð³Ñ€Ð¸Ð½Ñ -Name[vi]=Ti-gợ-ri-nia -Name[wa]=Tigrinia -Name[zh_CN]=ææ ¼é‡Œå°¼äºšè¯ -Name[zh_HK]=ææ ¼åˆ©å°¼äºžèªž -Name[zh_TW]=ææ ¼åˆ©å°¼äºžèªž -Name[zu]=Isi-Tigrinya [tk] Name=Turkmen -Name[ar]=تركماني -Name[az]=TürkmÉ™ncÉ™ -Name[be]=ТуркменÑÐºÐ°Ñ -Name[bg]=ТуркменÑки -Name[bn]=তà§à¦°à§à¦•à¦®à§‡à¦¨ -Name[bs]=Turkmenski -Name[ca]=Turcmeni -Name[cs]=Turkmenský -Name[csb]=TurkmeÅ„sczi -Name[cy]=Twrcmeneg -Name[de]=Turkmenisch -Name[el]=ΤουÏκμενικά -Name[eo]=Turkmena -Name[es]=Turkmenio -Name[et]=Turkmeeni -Name[eu]=Turkmeniera -Name[fa]=ترکمنی -Name[fi]=Turkmeeni -Name[fr]=Turkmène -Name[fy]=Turkmeensk -Name[ga]=Turcamáinis -Name[gl]=Turquemeno -Name[he]=×˜×•×¨×§×ž× ×™×ª -Name[hi]=तà¥à¤°à¥à¤•à¤®à¥‡à¤¨ -Name[hr]=Turkmenski -Name[hsb]=Turkmensce -Name[hu]=Türkmén -Name[it]=Turkmeno -Name[ja]=トルクメン語 -Name[ka]=თურქმენული -Name[kk]=Түркменше -Name[km]=ទួគមáŸáž“ីស្ážáž„់ -Name[lb]=Turkmenesch -Name[lt]=TurkmÄ—nų -Name[lv]=Turkmēņu -Name[mk]=ТуркмениÑтанÑки -Name[mn]=Туркмен -Name[nb]=Turkmensk -Name[nds]=Turkmeensch -Name[ne]=टरà¥à¤•à¤®à¥à¤¯à¤¾à¤¨ -Name[nl]=Turkmeens -Name[nn]=Turkmensk -Name[nso]=Se-Turkmen -Name[pa]=ਤà©à¨°à¨•à¨®à©€à¨¨ -Name[pl]=TurkmeÅ„ski -Name[pt]=Turquemenistanês -Name[pt_BR]=Turco -Name[ro]=Turcmenă -Name[ru]=ТуркменÑкий -Name[rw]=Igiturukimeni -Name[se]=Turkmenagiella -Name[sk]=turkménÄina -Name[sl]=turkmensko -Name[sq]=Turkmenisht -Name[sr]=ТуркмениÑтанÑки -Name[sr@Latn]=Turkmenistanski -Name[ss]=Si-Turkmen -Name[sv]=Turkmenska -Name[ta]=தà¯à®°à¯à®•à¯à®®à¯†à®©à¯ -Name[te]=à°¤à±à°°à±à°•à±à°®à±†à°¨à± -Name[tg]=Туркманӣ -Name[th]=ภาษาเติร์à¸à¹€à¸¡à¸™ -Name[tr]=Türkmence -Name[tt]=Törkmänçä -Name[uk]=ТуркменÑька -Name[uz]=Turkmancha -Name[uz@cyrillic]=Туркманча -Name[ven]=Munna wa Turkey -Name[vi]=Tuổc-men -Name[wa]=Turkmene -Name[zh_CN]=åœŸåº“æ›¼è¯ -Name[zh_HK]=土庫曼語 -Name[zh_TW]=土庫曼語 -Name[zu]=Amadoda Ase-Thekishi [tn] Name=Tswana -Name[ar]=التسوانا -Name[az]=Tsvanaca -Name[be]=Цвана -Name[bg]=ТÑуана -Name[bn]=তসওয়ানা -Name[eo]=Cvana -Name[et]=Tsvana -Name[eu]=Tswanera -Name[fa]=تی سوانا -Name[fi]=TÅ¡wana -Name[fy]=Tswanaansk -Name[ga]=Suáinis -Name[he]=צוו×× ×” -Name[hi]=तसà¥à¤µà¤¾à¤¨à¤¾ -Name[hu]=Tszvana -Name[ja]=ツワナ語 -Name[ka]=ტსვáƒáƒœáƒ -Name[kk]=ТÑвана -Name[km]=វ៉ាន់ណា -Name[lb]=Tswana-Sprooch -Name[mk]=Цвана -Name[mn]=Цвана -Name[ne]=तसà¥à¤µà¤¾à¤¨à¤¾ -Name[nn]=Setswana -Name[nso]=Setswana -Name[pa]=ਤਸਵਾਨਾ -Name[ro]=Å¢uană -Name[ru]=ТÑвана -Name[rw]=Igitswana -Name[se]=Tswanagiella -Name[sk]=ÄwanÄina -Name[sl]=tswana -Name[sq]=Cuanisht -Name[sr]=Цвана -Name[sr@Latn]=Cvana -Name[ss]=SiTswana -Name[ta]=ஸà¯à®µà®¾à®©à®¾ -Name[te]=à°¸à±à°µà°¾à°¨à°¾ -Name[tg]=Сванавӣ -Name[th]=ภาษาสวานา -Name[tt]=Tswanaça -Name[uk]=ТÑвана -Name[uz]=Tsvana -Name[uz@cyrillic]=ТÑвана -Name[vi]=T-xouă-nă -Name[xh]=Isitswana -Name[zh_CN]=èŒ¨ç“¦çº³è¯ -Name[zh_HK]=ç圖語 -Name[zh_TW]=ç圖語 -Name[zu]=Isi-Tswana [to] Name=Tonga -Name[ar]=تونجي -Name[az]=Tongaca -Name[be]=Тонга -Name[bg]=Тонга -Name[bn]=টংগা -Name[br]=Inizi Tonga -Name[el]=Τόνγκα -Name[eu]=Tongera -Name[fa]=تونگا -Name[fy]=Tongaansk -Name[ga]=Tongais -Name[he]=×˜×•× ×’×” -Name[hi]=टोनà¥à¤—ा -Name[ja]=トンガ語 -Name[ka]=ცáƒáƒœáƒ’რ-Name[kk]=Тонга -Name[km]=ážáž»áž„ហ្គោ -Name[ko]=통가어 -Name[lv]=TongieÅ¡u -Name[mk]=Тонга -Name[mn]=Тонга -Name[ne]=टोङà¥à¤—ा -Name[nn]=Tongansk -Name[nso]=Se-Tonga -Name[pa]=ਤੋਂਗਾ -Name[ro]=Tongă -Name[ru]=Тонга -Name[se]=Tongagiella -Name[sk]=tonga -Name[sl]=tongaÅ¡ko -Name[sq]=Tongisht -Name[sr]=Тонга -Name[ss]=Si-Tonga -Name[ta]=டோஙà¯à®•à®¾ -Name[te]=టొనà±à°—à°¾ -Name[tg]=Тонгаӣ -Name[th]=ภาษาทà¸à¸‡à¸à¸² -Name[uk]=Тонга -Name[uz@cyrillic]=Тонга -Name[vi]=Tông-ga -Name[zh_CN]=æ±¤åŠ è¯ -Name[zh_HK]=æ±åŠ 語 -Name[zh_TW]=æ±åŠ 語 -Name[zu]=Isi-Tonga [tr] Name=Turkish -Name[af]=Turks -Name[ar]=التركية -Name[az]=TürkcÉ™ -Name[be]=ТурÑÑ†ÐºÐ°Ñ -Name[bg]=ТурÑки -Name[bn]=তà§à¦°à§à¦•à§€ -Name[br]=Turkeg -Name[bs]=Turski -Name[ca]=Turc -Name[cs]=Turecký -Name[csb]=Tërecczi -Name[cy]=Twrceg -Name[da]=Tyrkisk -Name[de]=Türkisch -Name[el]=ΤουÏκικά -Name[eo]=Turka -Name[es]=Turco -Name[et]=Türgi -Name[eu]=Turkiera -Name[fa]=ترکی -Name[fi]=Turkki -Name[fr]=Turc -Name[fy]=Turks -Name[ga]=Tuircis -Name[gl]=Turco -Name[he]=טורקית -Name[hi]=तà¥à¤°à¥à¤•à¥€ -Name[hr]=Turski -Name[hsb]=Turkowsce -Name[hu]=Török -Name[id]=Turki -Name[is]=Tyrkneska -Name[it]=Turco -Name[ja]=トルコ語 -Name[ka]=თურქული -Name[kk]=Түрікше -Name[km]=ទួរគី -Name[ko]=터키어 -Name[ku]=Tirkî -Name[lb]=Türkesch -Name[lt]=Turkų -Name[lv]=Turku -Name[mk]=ТурÑки -Name[mn]=Турк -Name[ms]=Turki -Name[mt]=Tork -Name[nb]=Tyrkisk -Name[nds]=Törksch -Name[ne]=टरà¥à¤•à¤¿à¤¶ -Name[nl]=Turks -Name[nn]=Tyrkisk -Name[nso]=Se-Turkish -Name[oc]=Turc -Name[pa]=ਤà©à¨°à¨•à¨¿à¨¶ -Name[pl]=Turecki -Name[pt]=Turco -Name[pt_BR]=Turco -Name[ro]=Turcă -Name[ru]=Турецкий -Name[rw]=Ikinyaturukiya -Name[se]=Turkiijagiella -Name[sk]=tureÄtina -Name[sl]=turÅ¡ko -Name[sq]=Turqisht -Name[sr]=ТурÑки -Name[sr@Latn]=Turski -Name[ss]=Si-Turkish -Name[sv]=Turkiska -Name[ta]=தà¯à®°à¯à®•à¯à®•à®¿à®¯ -Name[te]=à°Ÿà°°à±à°•à°¿à°·à± -Name[tg]=Туркӣ -Name[th]=ภาษาตุรà¸à¸µ -Name[tr]=Türkçe -Name[tt]=Törekçä -Name[uk]=Турецька -Name[uz]=Turkcha -Name[uz@cyrillic]=Туркча -Name[vi]=Thổ-nhÄ©-kỳ -Name[wa]=Turk -Name[zh_CN]=åœŸè€³å…¶è¯ -Name[zh_HK]=土耳其語 -Name[zh_TW]=土耳其語 -Name[zu]=Isi-Thekishi [ts] Name=Tsonga -Name[ar]=التسونغا -Name[az]=Tsongaca -Name[be]=Цонга -Name[bg]=ТÑонга -Name[bn]=তসংগা -Name[eo]=Conga -Name[eu]=Tsongera -Name[fa]=تی سوانگا -Name[fy]=Tsongaansk -Name[ga]=Songais -Name[he]=×¦×•× ×’×” -Name[hi]=तà¥à¤¸à¥‹à¤¨à¥à¤—ा -Name[ja]=ツォンガ語 -Name[ka]=ცáƒáƒœáƒ’რ-Name[kk]=ТÑонга -Name[km]=សុងហ្កា -Name[lb]=Tsonga-Sprooch -Name[mk]=Цонга -Name[mn]=Цонга -Name[ne]=सोङà¥à¤—ा -Name[nso]=Se-Tsonga -Name[pa]=ਤਸੋਂਗਾ -Name[ro]=Tsongă -Name[ru]=ТÑонга -Name[rw]=Igitsonga -Name[se]=Tsongagiella -Name[sk]=tsonga -Name[sl]=tsonga -Name[sq]=Congisht -Name[sr]=Цонга -Name[sr@Latn]=Conga -Name[ss]=SiTsonga -Name[ta]=டிசோஙà¯à®•à®¾ -Name[te]=సొంగా -Name[tg]=Сонгавӣ -Name[th]=ภาษาซà¸à¸‡à¸à¸² -Name[tt]=Tsongaça -Name[uk]=Цонґа -Name[uz]=Songa -Name[uz@cyrillic]=Цонга -Name[vi]=T-xông-ga -Name[zh_CN]=特æ¾åŠ è¯ -Name[zh_HK]=Tsonga語 -Name[zh_TW]=Tsonga語 -Name[zu]=Isi-Tsonga [tt] Name=Tatar -Name[ar]=تتري -Name[az]=Tatarca -Name[be]=ТатарÑÐºÐ°Ñ -Name[bg]=ТатарÑки -Name[bn]=তাতার -Name[br]=Tatareg -Name[bs]=Tatarski -Name[cs]=Tatarský -Name[csb]=Tatarsczi -Name[de]=Tatarisch -Name[eo]=Tatara -Name[et]=Tatari -Name[eu]=Tatariera -Name[fa]=تاتاری -Name[fi]=Tataari -Name[fy]=Tataarsk -Name[ga]=Tatairis -Name[he]=טטרית -Name[hi]=तातार -Name[hr]=Tatarski -Name[hsb]=Tatarisce -Name[hu]=Tatár -Name[it]=Tartaro -Name[ja]=タタール語 -Name[ka]=თáƒáƒ—რული -Name[kk]=Татарша -Name[km]=ážáž¶ážáž¶ážš -Name[ko]=타타르어 -Name[lb]=Tataresch -Name[lt]=Totorių -Name[lv]=TatÄru -Name[mk]=ТатарÑки -Name[mn]=Татаар -Name[nds]=Tartaarsch -Name[ne]=टाटर -Name[nn]=Tatarisk -Name[nso]=Se-Tatar -Name[pa]=ਤਾਟਾਰ -Name[pl]=Tatarski -Name[ro]=Tătară -Name[ru]=ТатарÑкий -Name[rw]=Igitatari -Name[se]=Tatáragiella -Name[sk]=tatárÄina -Name[sl]=tatarsko -Name[sq]=Tatarisht -Name[sr]=ТатарÑки -Name[sr@Latn]=Tatarski -Name[ss]=Si-Tatar -Name[sv]=Tatariska -Name[ta]=டாடார௠-Name[te]=తతరౠ-Name[tg]=Тоторӣ -Name[th]=ภาษาทาทาร์ -Name[tt]=Tatarça -Name[uk]=ТатарÑька -Name[uz]=Totarcha -Name[uz@cyrillic]=Тотарча -Name[vi]=Ta-tă -Name[wa]=TatÃ¥r -Name[zh_CN]=éž‘é¼è¯ -Name[zh_HK]=韃é¼èªž -Name[zh_TW]=韃é¼èªž -Name[zu]=Isi-Tatar [tw] Name=Twi -Name[ar]=التوي -Name[az]=TvicÉ™ -Name[be]=Тві -Name[bg]=Туи -Name[bn]=টà§à§Ÿà¦¿ -Name[et]=Tvii -Name[fa]=توی -Name[he]=צ'ווי -Name[hi]=तà¥à¤µà¥€ -Name[hu]=Tvi -Name[ja]=ãƒãƒ¥ã‚¤èªž -Name[ka]=ტვი -Name[kk]=Тви -Name[km]=ទ្វី -Name[lb]=Akan-Sprooch -Name[mk]=Тви -Name[mn]=Тви -Name[ne]=तà¥à¤‡ -Name[nso]=Se-Twi -Name[pa]=ਤਵੀ -Name[ru]=Тви -Name[rw]=Igitwi -Name[se]=Twigiella -Name[sk]=twi -Name[sl]=twi -Name[sq]=Tuisht -Name[sr]=ТвиÑки -Name[sr@Latn]=Tviski -Name[ss]=Si-Twi -Name[ta]=தà¯à®µà¯€ -Name[te]=à°Ÿà±à°µà°¿ -Name[tg]=ТвиÑгӣ -Name[th]=ภาษาชวี -Name[tt]=Twiçä -Name[uk]=Тві -Name[uz]=Tvi -Name[uz@cyrillic]=Тви -Name[vi]=Tui -Name[zh_CN]=å¥‘ç»´è¯ -Name[zh_HK]=契ç¶èªž -Name[zh_TW]=契ç¶èªž -Name[zu]=Isi-Twi [ty] Name=Tahitian -Name[ar]=التاهيتية -Name[az]=TaiticÉ™ -Name[be]=Ð¢Ð°Ñ–Ñ†ÐºÐ°Ñ -Name[bg]=ТаитÑки -Name[bn]=তাহিশিয়ান -Name[br]=Tahitieg -Name[bs]=Tahićanski -Name[ca]=Tahitià -Name[cs]=Tahitský -Name[csb]=TahitaÅ„sczi -Name[cy]=Tahitieg -Name[da]=Tahitisk -Name[de]=Tahitianisch -Name[eo]=Tahitia -Name[es]=Tahitiano -Name[et]=Tahiti -Name[eu]=Tahitiera -Name[fa]=تاهیتی -Name[fi]=Tahiti -Name[fr]=Tahitien -Name[fy]=Tahitiaansk -Name[ga]=TaihÃtis -Name[gl]=Taitiano -Name[he]=טהיטית -Name[hi]=ताहितियन -Name[hr]=Tahićanski -Name[hsb]=Tahitisce -Name[hu]=Tahiti -Name[id]=Tahiti -Name[it]=Tahitiano -Name[ja]=タヒãƒèªž -Name[ka]=ტáƒáƒ˜áƒ¢áƒ˜ -Name[kk]=Таитише -Name[km]=ážáž¶áž áž·ážáž„់ -Name[ko]=타히티어 -Name[lb]=Tahitesch -Name[lt]=Tahiti -Name[lv]=TaitieÅ¡u -Name[mk]=ТахитÑки -Name[mn]=Тахит -Name[ms]=Tahiti -Name[nb]=Tahitisk -Name[nds]=Tahiitsch -Name[ne]=ताहिसिन -Name[nl]=Tahitiaans -Name[nn]=Tahitisk -Name[nso]=Se-Tahitian -Name[pa]=ਤਾਹੀਟੀਅਨ -Name[pl]=TahitaÅ„ski -Name[pt]=Tahitiano -Name[pt_BR]=Tahitiano -Name[ro]=Tahitiană -Name[ru]=Таити -Name[rw]=Ikinyatahiti -Name[se]=Tahitigiella -Name[sk]=tahitÄina -Name[sl]=tahitijsko -Name[sq]=Tahisht -Name[sr]=ТахићанÑки -Name[sr@Latn]=Tahićanski -Name[ss]=Si-Tahitian -Name[sv]=Tahitiska -Name[ta]=தஹிடியன௠-Name[te]=టహితియనౠ-Name[tg]=ТаитиÑгӣ -Name[th]=ภาษาตาฮิเตียน -Name[tt]=Tahitçä -Name[uk]=ТаїтÑнÑька -Name[uz]=Taxitian -Name[uz@cyrillic]=Тахитиан -Name[vi]=Ta-hi-ti -Name[wa]=Tahityin -Name[zh_CN]=塔希æè¯ -Name[zh_HK]=大溪地語 -Name[zh_TW]=大溪地語 -Name[zu]=Isi-Tahitian [ug] Name=Uighur -Name[ar]=الأويغورية -Name[az]=UyÄŸurca -Name[be]=Уігур -Name[bg]=Югхур -Name[bn]=উইঘà§à¦° -Name[bs]=Ujgurski -Name[csb]=Ujgùrsczi -Name[de]=Uigurisch -Name[eo]=Ujgura -Name[et]=Uiguuri -Name[fa]=یوگر -Name[fi]=Uiguuri -Name[ga]=ÚÃgiúiris -Name[he]=×ויגור -Name[hi]=उइघà¥à¤° -Name[hr]=Ujgurski -Name[hsb]=Ujgursce -Name[hu]=Ujgur -Name[ja]=ウイグル語 -Name[ka]=უიგურული -Name[kk]=Ұйғырша -Name[km]=វីហ្គៀរ -Name[lb]=Uiguresch -Name[lv]=Uiguru -Name[mk]=Ујгур -Name[mn]=Уйгур -Name[nb]=Uigursk -Name[nds]=Uighuursch -Name[ne]=विगोर -Name[nn]=Uigurisk -Name[nso]=Se-Uighur -Name[pa]=ਉਘੂਰ -Name[pl]=Ujgurski -Name[ro]=Uigură -Name[ru]=УйгурÑкий -Name[rw]=Icyuyiguru -Name[se]=Uiguragiella -Name[sk]=ujgurÄina -Name[sl]=ujgursko -Name[sq]=Uigurisht -Name[sr]=УјгурÑки -Name[sr@Latn]=Ujgurski -Name[ss]=Si-Uighur -Name[sv]=Uiguriska -Name[ta]=உயிகூர௠-Name[te]=ఉఇఘరౠ-Name[tg]=Уйгурӣ -Name[th]=ภาษาà¸à¸¸à¸¢à¸à¸¹à¸£à¹Œ -Name[tr]=Uygurca -Name[tt]=UyÄŸurça -Name[uk]=Уйгур -Name[uz]=UygÊ»urcha -Name[uz@cyrillic]=Уйғурча -Name[vi]=Ui-gua -Name[wa]=Ouygour -Name[zh_CN]=ç»´å¾å°”è¯ -Name[zh_HK]=ç¶å¾çˆ¾èªž -Name[zh_TW]=ç¶å¾çˆ¾èªž -Name[zu]=Isi-Uighur [uk] Name=Ukrainian -Name[af]=Ukraïnies -Name[ar]=الأوكرانية -Name[az]=Ukrayna Dili -Name[be]=УкраінÑÐºÐ°Ñ -Name[bg]=УкраинÑки -Name[bn]=ইউকà§à¦°à§‡à¦¨à§€à§Ÿ -Name[br]=Ukrainiek -Name[bs]=Ukrajinski -Name[ca]=Ucraïnès -Name[cs]=Ukrajinský -Name[csb]=ÙkrajiÅ„sczi -Name[cy]=Ukraineg -Name[da]=Ukrainsk -Name[de]=Ukrainisch -Name[el]=ΟυκÏανικά -Name[eo]=Ukraina -Name[es]=Ucranio -Name[et]=Ukraina -Name[eu]=Ukrainiera -Name[fa]=اکراینی -Name[fi]=Ukraina -Name[fr]=Ukrainien -Name[fy]=Oekraïnsk -Name[ga]=Úcráinis -Name[gl]=UcraÃno -Name[he]=×וקר××™× ×™×ª -Name[hi]=उकà¥à¤°à¥‡à¤¨à¤¿à¤¯à¤¨ -Name[hr]=Ukrajinski -Name[hsb]=Ukrainsce -Name[hu]=Ukrán -Name[id]=Ukraina -Name[is]=ÚkraÃnska -Name[it]=Ucraino -Name[ja]=ウクライナ語 -Name[ka]=უკრáƒáƒ˜áƒœáƒ£áƒšáƒ˜ -Name[kk]=Украинша -Name[km]=អ៊ុយក្រែន -Name[ko]=ìš°í¬ë¼ì´ë‚˜ì–´ -Name[lb]=Ukrainesch -Name[lt]=UkrainieÄių -Name[lv]=Ukraiņu -Name[mk]=УкраинÑки -Name[mn]=Украйн -Name[ms]=Ukrainia -Name[mt]=Ukranjan -Name[nb]=Ukrainsk -Name[nds]=Ukrainsch -Name[ne]=यà¥à¤•à¥à¤°à¥‡à¤¨à¥€ -Name[nl]=Oekraïns -Name[nn]=Ukrainsk -Name[nso]=Se-Ukrainian -Name[oc]=Ucranian -Name[pa]=ਯੂਕਰੇਨ -Name[pl]=UkraiÅ„ski -Name[pt]=Ucraniano -Name[pt_BR]=Ucraniano -Name[ro]=Ucrainiană -Name[ru]=УкраинÑкий -Name[rw]=Ikinya-ikarayini -Name[se]=Ukrainagiella -Name[sk]=ukrajinÄina -Name[sl]=ukrajinsko -Name[sq]=Ukrainisht -Name[sr]=УкрајинÑки -Name[sr@Latn]=Ukrajinski -Name[ss]=Si-Ukrainian -Name[sv]=Ukrainska -Name[ta]=உகà¯à®°à¯‡à®©à®¿à®¯à®©à¯ -Name[te]=ఉకà±à°°à±‡à°¨à°¿à°¯à°¨à± -Name[tg]=Украинӣ -Name[th]=ภาษายูเครน -Name[tr]=Ukrayna Dili -Name[tt]=Ukrainça -Name[uk]=УкраїнÑька -Name[uz]=Ukraincha -Name[uz@cyrillic]=Украинча -Name[vi]=U-cợ-rainh -Name[wa]=Oucrinnyin -Name[xh]=Ukranian -Name[zh_CN]=ä¹Œå…‹å…°è¯ -Name[zh_HK]=çƒå…‹è˜èªž -Name[zh_TW]=çƒå…‹è˜èªž -Name[zu]=Isi-Ukraniyani [ur] Name=Urdu -Name[ar]=أوردي -Name[az]=Urduca -Name[be]=Урду -Name[bg]=Урду -Name[bn]=উরà§à¦¦à§ -Name[ca]=Urdú -Name[cy]=Wrdw -Name[eo]=Urduo -Name[fa]=اردو -Name[fy]=Urdû -Name[ga]=Urdais -Name[he]=×ורדו -Name[hi]=उरà¥à¤¦à¥‚ -Name[ja]=ウルドゥー語 -Name[ka]=ურდუ -Name[kk]=Урду -Name[km]=អ៊ូរ្ឌូ -Name[ko]=울ë‘ì–´ -Name[mk]=Урду -Name[mn]=Урду -Name[ne]=उरà¥à¤¦à¥ -Name[nso]=Se-Urdu -Name[pa]=ਉਰਦੂ -Name[ru]=Урду -Name[rw]=Icyuridu -Name[se]=Urdugiella -Name[sk]=urdÄina -Name[sl]=urdu -Name[sq]=Urdisht -Name[sr]=Урду -Name[ss]=Si-Urdu -Name[ta]=உரà¯à®¤à¯ -Name[te]=ఉరà±à°¦à± -Name[tg]=Урду -Name[th]=ภาษาà¸à¸¹à¸£à¹Œà¸”ู -Name[tt]=Urduça -Name[uk]=Урду -Name[uz@cyrillic]=Урду -Name[vi]=Uổ-Ä‘u -Name[wa]=Ourdou -Name[zh_CN]=ä¹Œå°”éƒ½è¯ -Name[zh_HK]=çƒéƒ½èªž -Name[zh_TW]=çƒéƒ½èªž -Name[zu]=Isi-Urdu [uz] Name=Uzbek -Name[ar]=أوزباكي -Name[az]=ÖzbÉ™kcÉ™ -Name[be]=Ð£Ð·Ð±ÐµÑ†ÐºÐ°Ñ -Name[bg]=УзбекÑки -Name[bn]=উজবেক -Name[br]=Ouzbeg -Name[bs]=UzbeÄki -Name[cs]=Uzbecký -Name[csb]=Ùzbecczi -Name[cy]=Wzbec -Name[de]=Usbekisch -Name[el]=Ουζμπεκικά -Name[eo]=Uzbeka -Name[es]=Uzbeko -Name[et]=Usbeki -Name[eu]=Uzbekera -Name[fa]=ازبکی -Name[fi]=Uzbekki -Name[fy]=Oezbeeksk -Name[ga]=Úisbéicis -Name[gl]=Uzbeque -Name[he]=×וזבקית -Name[hi]=उजà¥à¤¬à¤¼à¥‡à¤• -Name[hr]=UzbeÄki -Name[hsb]=Uzbekisce -Name[hu]=Ãœzbég -Name[it]=Uzbeco -Name[ja]=ウズベク語 -Name[ka]=უზბეკური -Name[kk]=Өзбекше -Name[km]=អ៊ូហ្សបáŸáž‚ីស្ážáž„់ -Name[ko]=ìš°ì¦ˆë² í¬ì–´ -Name[lb]=Usbekesch -Name[lt]=Uzbekų -Name[lv]=Uzbeku -Name[mk]=УзбекиÑтанÑки -Name[mn]=Узбек -Name[nb]=Usbekisk -Name[nds]=Usbeeksch -Name[ne]=उजà¥à¤¬à¥‡à¤• -Name[nl]=Uzbeeks -Name[nn]=Usbekisk -Name[nso]=Se-Uzbek -Name[pa]=ਊਜੇਬਕ -Name[pl]=Uzbecki -Name[pt]=Usbequistanês -Name[ro]=Uzbecă -Name[ru]=УзбекÑкий -Name[rw]=Icyuzubeka -Name[se]=Uzbehkagiella -Name[sk]=uzbeÄtina -Name[sl]=uzbeÅ¡ko -Name[sq]=Uzbekisht -Name[sr]=Узбечки -Name[sr@Latn]=UzbeÄki -Name[ss]=Si-Uzbek -Name[sv]=Uzbekiska -Name[ta]=உஸà¯à®ªà¯†à®•à¯ -Name[te]=ఉజà±à°¬à±†à°•à± -Name[tg]=Ӯзбекӣ -Name[th]=ภาษาà¸à¸¸à¸‹à¹€à¸šà¸à¸´à¸ªà¸–าน -Name[tr]=Özbek -Name[tt]=Ãœzbäkçä -Name[uk]=Узбецька -Name[uz]=OÊ»zbekcha -Name[uz@cyrillic]=Ўзбекча -Name[vi]=U-x-béc -Name[wa]=Ouzbeke -Name[zh_CN]=ä¹Œå…¹åˆ«å…‹è¯ -Name[zh_HK]=çƒèŒ²åˆ¥å…‹èªž -Name[zh_TW]=çƒèŒ²åˆ¥å…‹èªž -Name[zu]=Isi-Uzbek [uz@cyrillic] Name=Uzbek (Cyrillic) -Name[bg]=УзбекÑки (кирилица) -Name[ca]=Uzbek (CirÃl·lic) -Name[da]=Uzbekisk (kyrillisk) -Name[de]=Usbekisch (Kyrillisch) -Name[el]=Ουζμπεκικά (ΚυÏιλικά) -Name[es]=Uzbeko (CirÃlico) -Name[et]=Usbeki (kirillitsa) -Name[fr]=Uzbek (Cyrillique) -Name[is]=Uzbek (KyrilÃsk) -Name[it]=Usbeco (Cirillico) -Name[ja]=ウズベク語 (ã‚リル文å—) -Name[km]=អ៊ូហ្សបáŸáž‚ីស្ážáž„់ (ស៊ីរីលីក) -Name[nds]=Usbeeksch (kyrillsch) -Name[pl]=Uzbecki (cyrlica) -Name[sk]=uzbeÄtina (cyrilika) -Name[sr]=Узбечки ћирилични -Name[sr@Latn]=Узбечки ћирилични -Name[sv]=Kyrillisk Uzbekiska -Name[zh_TW]=çƒèŒ²åˆ¥å…‹èªžï¼ˆæ–¯æ‹‰å¤«èªžç³»ï¼‰ [ven] Name=Venda -Name[ar]=Ùيندا -Name[be]=Венда -Name[bg]=Венда -Name[bn]=à¦à§‡à¦£à§à¦¡à¦¾ -Name[de]=Tshivenda -Name[fa]=وندا -Name[ga]=Veindis -Name[hi]=वेंडा -Name[ja]=ベンダ語 -Name[ka]=ვენდრ-Name[kk]=Венда -Name[km]=វង់ដា -Name[ko]=벤다어 -Name[mk]=Венда -Name[mn]=Венда -Name[ne]=à¤à¥‡à¤¨à¥à¤¡à¤¾ -Name[pa]=ਵਾਂਡਾ -Name[ru]=Венда -Name[rw]=Ikivenda -Name[se]=Vendagiella -Name[sk]=venda -Name[sl]=venda -Name[sq]=Vendisht -Name[sr]=Венда -Name[ta]=வெணà¯à®Ÿà®¾ -Name[te]=వెండా -Name[tg]=Вендаӣ -Name[th]=ภาษาเวนดา -Name[tt]=Vendaça -Name[uk]=Венда -Name[uz@cyrillic]=Венда -Name[vi]=Ven-Ä‘a -Name[zh_CN]=é—»è¾¾è¯ [vi] Name=Vietnamese -Name[af]=Viëtnamees -Name[ar]=الÙييتنامية -Name[az]=Vyetnamca -Name[be]=Ð’'етнамÑÐºÐ°Ñ -Name[bg]=ВиетнамÑки -Name[bn]=à¦à¦¿à§Ÿà§‡à¦¤à¦¨à¦¾à¦®à§€ -Name[br]=Viet-Nameg -Name[bs]=Vijetnamski -Name[ca]=Vietnamita -Name[cs]=Vietnamský -Name[csb]=Wietnamsczi -Name[cy]=Vietnameg -Name[da]=Vietnamesisk -Name[de]=Vietnamesisch -Name[el]=ΒιετναμÎζικα -Name[eo]=Vjetnama -Name[es]=Vietnamita -Name[et]=Vietnami -Name[eu]=Vietnamera -Name[fa]=ویتنامی -Name[fi]=Vietnam -Name[fr]=Vietnamien -Name[fy]=Vietnameesk -Name[ga]=VÃtneamais -Name[gl]=Vietnamita -Name[he]=×•×™×™×˜× ×מית -Name[hi]=वियतनामी -Name[hr]=Vijetnamski -Name[hsb]=Vietnamsce -Name[hu]=Vietnami -Name[id]=Vietnam -Name[is]=VÃetnamska -Name[it]=Vietnamita -Name[ja]=ベトナム語 -Name[ka]=ვიეტნáƒáƒ›áƒ£áƒ ი -Name[kk]=Вьетнамша -Name[km]=វៀážážŽáž¶áž˜ -Name[ko]=ë² íŠ¸ë‚¨ì–´ -Name[ku]=Viyetnamî -Name[lb]=Vietnamesesch -Name[lt]=VietnamieÄių -Name[lv]=VjetnamieÅ¡u -Name[mk]=ВиетнамÑки -Name[mn]=Витьнам -Name[ms]=Vietnam -Name[mt]=Vjetnamiż -Name[nb]=Vietnamesisk -Name[nds]=Vietnameesch -Name[ne]=à¤à¤¿à¤¯à¤¤à¤¨à¤¾à¤®à¥€ -Name[nl]=Vietnamees -Name[nn]=Vietnamesisk -Name[nso]=Se-Vietnamese -Name[pa]=ਵੀਅਤਨਾਮੀ -Name[pl]=Wietnamski -Name[pt]=Vietnamita -Name[pt_BR]=Vietnamita -Name[ro]=Vietnameză -Name[ru]=ВьетнамÑкий -Name[rw]=Ikinyaviyetinamu -Name[se]=Vietnamagiella -Name[sk]=vietnamÄina -Name[sl]=vietnamsko -Name[sq]=Vietnamisht -Name[sr]=ВијетнамÑки -Name[sr@Latn]=Vijetnamski -Name[ss]=Si-Vietnamese -Name[sv]=Vietnamesiska -Name[ta]=வியடà¯à®©à®¾à®®à®¿à®¯ -Name[te]=వియతà±à°¨à°¾à°®à±€à°¸à± -Name[tg]=Ветнамӣ -Name[th]=ภาษาเวียตนาม -Name[tr]=Vietnamca -Name[tt]=Vietnamça -Name[uk]=Ð’'єтнамÑька -Name[uz]=Vetnamcha -Name[uz@cyrillic]=Ветнамча -Name[vi]=Việt -Name[wa]=Vietnamyin -Name[zh_CN]=越å—è¯ -Name[zh_HK]=越å—語 -Name[zh_TW]=越å—語 -Name[zu]=Isi-Vietnamese [vo] Name=Volapük -Name[ar]=الÙولابوك -Name[az]=VolapükcÉ™ -Name[be]=Валапук -Name[bg]=Волапюк -Name[bn]=à¦à§‹à¦²à¦¾à¦ªà§à¦• -Name[br]=Volapuk -Name[cy]=Volapuk -Name[da]=Volapyk -Name[eo]=Volapuko -Name[fa]=ولاپوک -Name[he]=וולפיק -Name[hi]=वोलापक -Name[ja]=ボラピューク語 -Name[ka]=ვáƒáƒšáƒáƒžáƒ˜áƒ£áƒ™áƒ˜ -Name[kk]=Волапюк -Name[km]=វូឡាភូក -Name[mk]=Волапук -Name[mn]=Волапүк -Name[ne]=à¤à¥‹à¤²à¤¾à¤ªà¥à¤• -Name[nl]=Volapúk -Name[nn]=Volapyk -Name[nso]=Se-Volapük -Name[pa]=ਵੂਲਾਉਕ -Name[ro]=Volapucă -Name[ru]=Волапюк -Name[rw]=Ikivolapuke -Name[se]=Volapükgiella -Name[sk]=volapük -Name[sl]=volapük -Name[sq]=Volapisht -Name[sr]=ВолапикÑки -Name[sr@Latn]=Volapikski -Name[ss]=Si-Volapük -Name[ta]=வொலà¯à®ªà®¾à®•à¯ -Name[te]=వొలపà±à°•à± -Name[tg]=Волапёкӣ -Name[th]=ภาษาวà¸à¸¥à¸²à¸žà¸¸à¸„ -Name[tt]=Volapükçä -Name[uk]=Волапюк -Name[uz]=Volapuk -Name[uz@cyrillic]=Волапук -Name[vi]=Vo-la-puc -Name[zh_CN]=æ²ƒæ‹‰æ™®å…‹è¯ -Name[zu]=Isi-Volapük [wa] Name=Walloon -Name[ar]=الوالون -Name[az]=Valonca -Name[be]=ВалонÑÐºÐ°Ñ -Name[bg]=ВалонÑки -Name[bn]=ওয়ালà§à¦¨ -Name[br]=Walloneg -Name[bs]=Valonski -Name[cs]=Wallonský -Name[csb]=WaloÅ„sczi -Name[da]=Vallonsk -Name[de]=Wallonisch -Name[eo]=Valona -Name[et]=Vallooni -Name[eu]=Waloiera -Name[fa]=والونی -Name[fi]=Valloni -Name[fr]=Wallon -Name[fy]=Waalsk -Name[ga]=Vallúnais -Name[gl]=Valón -Name[he]=×•×•×œ×•× ×™×ª -Name[hi]=वालून -Name[hr]=Valonski -Name[hsb]=Walloonisce -Name[hu]=Vallon -Name[id]=Wallon -Name[is]=Vallónska -Name[it]=Vallone -Name[ja]=ワãƒãƒ³èªž -Name[ka]=ვáƒáƒšáƒáƒœáƒ£áƒ ი -Name[kk]=Валонша -Name[km]=វ៉ាឡុង -Name[ko]=ì™ˆë¡ ì–´ -Name[ku]=Walûn -Name[lb]=Wallounesch -Name[lt]=Valonų -Name[lv]=Valoņu -Name[mk]=ВалонÑки -Name[mn]=Валлоон -Name[nb]=Vallonsk -Name[nds]=Walloonsch -Name[ne]=वालोन -Name[nl]=Waals -Name[nn]=Vallonsk -Name[nso]=Se-Walloon -Name[oc]=Valon -Name[pa]=ਵਾਲੂਨ -Name[pl]=WaloÅ„ski -Name[pt]=Valão -Name[ro]=Valonă -Name[ru]=ВаллонÑкий -Name[rw]=Ikiwaluni -Name[se]=Vallonagiella -Name[sk]=valónÄina -Name[sl]=walloonsko -Name[sq]=Uallunisht -Name[sr]=ВалонÑки -Name[sr@Latn]=Valonski -Name[ss]=Si-Walloon -Name[sv]=Vallonska -Name[ta]=வாலூன௠-Name[te]=వాలూనౠ-Name[tg]=Валунӣ -Name[th]=ภาษาวัลลูน -Name[tr]=Valonca -Name[tt]=Walonça -Name[uk]=ВаллонÑька -Name[uz]=Valloncha -Name[uz@cyrillic]=Валлонча -Name[vi]=Oua-lunh -Name[wa]=Walon -Name[zh_CN]=ç“¦é¾™è¯ -Name[zh_HK]=è¯éš†èªž -Name[zh_TW]=è¯éš†èªž -Name[zu]=Isi-Walloon [wo] Name=Wolof -Name[ar]=الوولو٠-Name[az]=Volofca -Name[be]=Волаф -Name[bg]=Уолоф -Name[bn]=ওয়োলফ -Name[cy]=Woloff -Name[eo]=Volofa -Name[et]=Volofi -Name[eu]=Wolofera -Name[fa]=ولو٠-Name[ga]=Volaifis -Name[he]=וולוף -Name[hi]=वालाफ़ -Name[hr]=Volofski -Name[hu]=Volof -Name[ja]=ウォãƒãƒ•èªž -Name[ka]=უáƒáƒšáƒáƒ¤áƒ˜ -Name[kk]=Волофша -Name[km]=វូឡុហ្វ -Name[lb]=Wolof-Sprooch -Name[mk]=Волоф -Name[mn]=Волоф -Name[ne]=वलोफ -Name[nso]=Se-Wolof -Name[pa]=ਵੂਲੂਫ -Name[ro]=Volofă -Name[ru]=Уолоф -Name[rw]=Ikiwolofu -Name[se]=Volofagiella -Name[sk]=wolof -Name[sl]=wolof -Name[sq]=Ollofisht -Name[sr]=ВолофÑки -Name[sr@Latn]=Volofski -Name[ss]=Si-Wolof -Name[ta]=வொலொஃப௠-Name[te]=వొలొఫౠ-Name[tg]=Волофӣ -Name[th]=ภาษาวà¸à¸¥à¸à¸Ÿ -Name[tt]=Wolofça -Name[uk]=Волоф -Name[uz]=Volof -Name[uz@cyrillic]=Волоф -Name[vi]=Ouo-lo-ph -Name[zh_CN]=æ²ƒæ´›å¤«è¯ -Name[zh_HK]=Wolof語 -Name[zh_TW]=Wolof語 -Name[zu]=Isi-Wolof [xh] Name=Xhosa -Name[ar]=الهاوسا -Name[be]=КшоÑа -Name[bg]=КÑоÑа -Name[bn]=জোসা -Name[de]=isiXhosa -Name[eo]=Ĥosa -Name[eu]=Xhosera -Name[fa]=زسایی -Name[ga]=Cóisis -Name[he]=קוזה -Name[hi]=à¤à¥‹à¤¸à¤¾ -Name[hu]=Xhosza -Name[ja]=コサ語 -Name[ka]=ქშáƒáƒ¡áƒ -Name[kk]=КхоÑа -Name[km]=ឃសាLesotho -Name[ko]=엑스호사어 -Name[mk]=КÑоÑа -Name[mn]=ЧоÑа -Name[ne]=होजा -Name[nso]=Sethosa -Name[pa]=à¨à©‹à¨¸à¨¾ -Name[ru]=КшоÑа -Name[rw]=Ikigisosa -Name[se]=Xhosagiella -Name[sk]=xhosa -Name[sl]=xhosa -Name[sq]=Gjosisht -Name[sr]=ЗоÑа -Name[sr@Latn]=Zosa -Name[ss]=SiXhosa -Name[ta]=சோசா -Name[te]=à°•à±à°œà±Šà°¸à°¾ -Name[tg]=ХоÑа -Name[th]=ภาษาโคซา -Name[uk]=КÑоза -Name[uz@cyrillic]=ХҳоÑа -Name[ven]=Xhoza -Name[vi]=Xô-xa -Name[wa]=Xhossa -Name[xh]=isixhosa -Name[zh_CN]=科è¨è¯ -Name[zh_HK]=科薩語 -Name[zh_TW]=科薩語 -Name[zu]=Isi-Xhosa [yi] Name=Yiddish -Name[ar]=اليديش -Name[az]=YiddiÅŸcÉ™ -Name[be]=Ідыш -Name[bg]=Идиш -Name[bn]=য়িডà§à¦¡à¦¿à¦¶ -Name[bs]=JidiÅ¡ -Name[cs]=JidiÅ¡ -Name[csb]=Jidisz -Name[cy]=Yideg -Name[de]=Jiddish -Name[eo]=Jida -Name[et]=JidiÅ¡ -Name[eu]=Jiddish -Name[fa]=عبری -Name[fi]=JiddiÅ¡ -Name[fy]=Jiddysk -Name[ga]=Giúdais -Name[gl]=IÃdiche -Name[he]=יידיש -Name[hi]=यिदिश -Name[hr]=JidiÅ¡ -Name[hsb]=Jidisce -Name[hu]=Jiddis -Name[is]=JiddÃska -Name[ja]=イディッシュ語 -Name[ka]=იდიში -Name[kk]=Идиш -Name[km]=យីឌីហ្ស -Name[ko]=ì´ë””시어 -Name[lb]=Jiddesch -Name[lt]=JidiÅ¡ -Name[lv]=JidiÅ¡Å¡ -Name[mk]=ЕврејÑки -Name[mn]=Юүд -Name[nb]=Jiddisk -Name[nds]=Jiddsch -Name[ne]=इडिस -Name[nn]=Jiddisk -Name[nso]=Se-Yiddish -Name[pa]=ਯੀਡਿਸ਼ -Name[pl]=Jidysz -Name[ro]=IdiÅŸ -Name[ru]=Идиш -Name[rw]=Ikiyidishi -Name[se]=JiddiÅ¡giella -Name[sk]=jidiÅ¡ -Name[sl]=yiddish -Name[sq]=Jidisht -Name[sr]=ЈидијÑки -Name[sr@Latn]=Jidijski -Name[ss]=Si-Yiddish -Name[ta]=யிடà¯à®Ÿà®¿à®·à¯ -Name[te]=యిడà±à°¡à°¿à°·à± -Name[tg]=Йидишӣ -Name[th]=ภาษายิดดิช -Name[tt]=YidiÅŸ -Name[uk]=Ідиш -Name[uz@cyrillic]=Йиддиш -Name[vi]=Y-Ä‘Ãt -Name[wa]=Yidish -Name[zh_CN]=ä¾åœ°è¯ -Name[zh_HK]=æ„第緒語 -Name[zh_TW]=æ„第緒語 -Name[zu]=Isi-Yidishi [yo] Name=Yoruba -Name[ar]=اليوروبا -Name[az]=Yorubaca -Name[be]=Яруба -Name[bg]=Йоруба -Name[bn]=য়োরà§à¦¬à¦¾ -Name[eo]=Joruba -Name[et]=Joruba -Name[eu]=Jorubera -Name[fa]=یوروبا -Name[fi]=Joruba -Name[ga]=Iarúibis -Name[gl]=Yorùbá -Name[he]=יורובה -Name[hi]=योरà¥à¤¬à¤¾ -Name[hu]=Joruba -Name[ja]=ヨルãƒèªž -Name[ka]=იáƒáƒ უბრ-Name[kk]=Йоруба -Name[km]=យរូបា -Name[ko]=요루바어 -Name[lb]=Yoruba-Sprooch -Name[lv]=Jarubu -Name[mk]=Јоруба -Name[mn]=Ðруба -Name[ne]=योरूबा -Name[nn]=Joruba -Name[nso]=Se-Yoruba -Name[pa]=ਯੂਰੋਬਾ -Name[ro]=Iorubă -Name[ru]=Йоруба -Name[rw]=Ikiyoruba -Name[se]=Jorubagiella -Name[sk]=jorubÄina -Name[sl]=yoruba -Name[sq]=Jorubisht -Name[sr]=ЈорубÑки -Name[sr@Latn]=Jorubski -Name[ss]=Si-Yoruba -Name[ta]=யொரூபா -Name[te]=యొరà±à°¬à°¾ -Name[tg]=Ðруба -Name[th]=ภาษาโยรูบา -Name[tt]=Yorubaça -Name[uk]=Йоруба -Name[uz@cyrillic]=Ðруба -Name[vi]=Yô-ru-ba -Name[wa]=Yorouba -Name[zh_CN]=约é²å·´è¯ -Name[zh_HK]=優é¯å·´èªž -Name[zh_TW]=優é¯å·´èªž -Name[zu]=Isi-Yoruba [za] Name=Zhuang -Name[ar]=الزهوانغ -Name[az]=Zhuangca -Name[be]=Цванг -Name[bg]=Жуанг -Name[bn]=à¦à§à§Ÿà¦¾à¦‚ -Name[et]=Zhuangi -Name[fa]=هونگ -Name[ga]=Siuáingis -Name[gl]=Chuan -Name[he]=×’'ו×× ×’ -Name[hi]=à¤à¥à¤†à¤‚ग -Name[ja]=ãƒãƒ¥ãƒ¯ãƒ³èªž -Name[ka]=ჩჟუáƒáƒœáƒ˜ -Name[kk]=Зуангша -Name[km]=ចួង -Name[mk]=Жуанг -Name[mn]=Жунгаа -Name[ne]=à¤à¤¿à¤†à¤™ -Name[nso]=Se-Zhuang -Name[pa]=ਜ਼ੂੰਗ -Name[ru]=Чжуанг -Name[rw]=Ikizwange -Name[se]=Zhuangagiella -Name[sk]=ÄuangÄina -Name[sl]=zhuang -Name[sq]=Zhuanginsht -Name[sr]=Цуанг -Name[sr@Latn]=Cuang -Name[ss]=Si-Zhuang -Name[ta]=சà¯à®µà®¾à®™à¯ -Name[te]=à°œà±à°µà°¾à°‚à°—à± -Name[tg]=Жуанг -Name[th]=ภาษาจ้วง -Name[tt]=Cuañça -Name[uk]=Жуан -Name[uz]=Zxuang -Name[uz@cyrillic]=Зхуанг -Name[vi]=Xuang -Name[zh_CN]=å£®è¯ -Name[zh_HK]=Zhuang語 -Name[zh_TW]=Zhuang語 -Name[zu]=Isi-Zhuang [zh] Name=Chinese -Name[af]=Sjinese -Name[ar]=الصينية -Name[az]=ÇincÉ™ -Name[be]=КітайÑÐºÐ°Ñ -Name[bg]=КитайÑки -Name[bn]=চৈনিক -Name[br]=Sinaeg -Name[bs]=Kineski -Name[ca]=Xinès -Name[cs]=ÄŒÃnský -Name[csb]=ChiÅ„sczi -Name[cy]=Tseineeg -Name[da]=Kinesisk -Name[de]=Chinesisch -Name[el]=ΚινÎζικα -Name[eo]=Ĉina -Name[es]=Chino -Name[et]=Hiina -Name[eu]=Txinera -Name[fa]=چینی -Name[fi]=Kiina -Name[fr]=Chinois -Name[fy]=Sjineesk -Name[ga]=SÃnis -Name[gl]=Chinés -Name[he]=×¡×™× ×™×ª -Name[hi]=चाइनीस -Name[hr]=Kineski -Name[hsb]=Chinsce -Name[hu]=KÃnai -Name[id]=Cina -Name[is]=KÃnverska -Name[it]=Cinese -Name[ja]=ä¸å›½èªž -Name[ka]=ჩინური -Name[kk]=Қытайша -Name[km]=áž…áž·áž“ -Name[ko]=중êµì–´ -Name[ku]=Çînî -Name[lb]=Chinesesch -Name[lt]=KinieÄių -Name[lv]=ĶīnieÅ¡u -Name[mi]=Reo Häina -Name[mk]=КинеÑки -Name[mn]=Ð¥Ñтад -Name[ms]=China -Name[mt]=ÄŠiniż -Name[nb]=Kinesisk -Name[nds]=Chineesch -Name[ne]=चिनियाठ-Name[nl]=Chinees -Name[nn]=Kinesisk -Name[nso]=Se-China -Name[oc]=Chinès -Name[pa]=ਚੀਨੀ -Name[pl]=ChiÅ„ski -Name[pt]=Chinês -Name[pt_BR]=Chinês -Name[ro]=Chineză -Name[ru]=КитайÑкий -Name[rw]=Igishinwa -Name[se]=Kiinnágiella -Name[sk]=ÄÃnÅ¡tina -Name[sl]=kitajsko -Name[sq]=Kinezisht -Name[sr]=КинеÑки -Name[sr@Latn]=Kineski -Name[ss]=SiShayina -Name[sv]=Kinesiska -Name[ta]=சீனம௠-Name[te]=చైనీసౠ-Name[tg]=Хитоӣ -Name[th]=ภาษาจีน -Name[tr]=Çince -Name[tt]=Çinçä -Name[uk]=КитайÑька -Name[uz]=Xitoycha -Name[uz@cyrillic]=Хитойча -Name[ven]=Mutshaina -Name[vi]=Trung quốc -Name[wa]=Chinwès -Name[xh]=Isitshayina -Name[zh_CN]=ä¸æ–‡ -Name[zh_HK]=ä¸æ–‡ -Name[zh_TW]=ä¸æ–‡ -Name[zu]=Isi-Shayina [zh_CN] -Name=Chinese Simplified -Name[af]=Sjinese vereenvoudig -Name[be]=КітайÑÐºÐ°Ñ ÑÐ¿Ñ€Ð¾ÑˆÑ‡Ð°Ð½Ð°Ñ -Name[bg]=КитайÑки опроÑтен -Name[bn]=সরলীকৃত চৈনিক -Name[br]=Sineg eeun -Name[bs]=Kineski pojednostavljeni -Name[ca]=Xinès simplificat -Name[cs]=ÄŒÃnský (zjednoduÅ¡ená) -Name[csb]=ChiÅ„sczi Prosti -Name[cy]=Tseineeg Syml -Name[da]=Kinesisk simplificeret -Name[de]=Chinesisch (vereinfachtes) -Name[el]=ΚινÎζικα απλά -Name[eo]=Simpla Ĉina -Name[es]=Chino simplificado -Name[et]=Hiina (lihtsustatud) -Name[eu]=Txinatar soildua -Name[fa]=زبان چینی ساده‌شده -Name[fi]=Yksinkertaistettu kiina -Name[fr]=Chinois simplifié -Name[fy]=Sjineesk (ynfaldich) -Name[ga]=SÃnis Simplithe -Name[gl]=Chinés simplificado -Name[he]=×¡×™× ×™×ª מופשטת -Name[hr]=Kineski pojednostavljen -Name[hsb]=Chinsce (zjednorjene) -Name[hu]=KÃnai (egyszerűsÃtett) -Name[id]=Cina Sederhana -Name[is]=Einfölduð kÃnverska -Name[it]=Cinese semplificato -Name[ja]=ä¸å›½èªž ç°¡ä½“å— -Name[ka]=ჩინური გáƒáƒ›áƒáƒ ტივებული -Name[kk]=Жеңілдеткен қытайша -Name[km]=ចិនសាមញ្ញ -Name[ku]=Çîniya Hesankirî -Name[lb]=Einfacht Chinesesch -Name[lt]=Kinų supaprastinta -Name[lv]=ĶīnieÅ¡u vienkÄrÅ¡otÄ -Name[mk]=КинеÑки поедноÑтавен -Name[nb]=Forenklet kinesisk -Name[nds]=Vereenfacht Chineesch -Name[ne]=सरलीकृत चिनियाठ-Name[nl]=Chinees (Vereenvoudigd) -Name[nn]=Kinesisk (forenkla) -Name[pa]=ਚੀਨੀ ਸਧਾਰਨ -Name[pl]=ChiÅ„ski uproszczony -Name[pt]=Chinês Simplificado -Name[pt_BR]=Chinês Simplificado -Name[ro]=Chineză simplificată -Name[ru]=КитайÑкий (КÐÐ ) -Name[rw]=Igishinwa Cyoroheje -Name[se]=Ãlkiduvvon kiinnágiella -Name[sk]=ÄÃnÅ¡tina (zjednoduÅ¡ená) -Name[sl]=poenostavljeno kitajsko -Name[sr]=ПоједноÑтављени кинеÑки -Name[sr@Latn]=Pojednostavljeni kineski -Name[sv]=Förenklad kinesiska -Name[ta]=சீனம௠சà¯à®²à®ªà®®à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ -Name[te]=సరళికరించిన చైనీసౠ-Name[tg]=Хитоӣ (Оддӣ) -Name[th]=ภาษาจีนประยุà¸à¸•à¹Œ -Name[tr]=BasitleÅŸtirilmiÅŸ Çince -Name[tt]=Çinçä (Ciñel) -Name[uk]=КитайÑька (Ñпрощена) -Name[uz]=Soddalashtirilgan Xitoycha -Name[uz@cyrillic]=Соддалаштирилган Хитойча -Name[vi]=Trung quốc (phổ thông) -Name[zh_CN]=简体ä¸æ–‡ -Name[zh_HK]=ç°¡é«”ä¸æ–‡ -Name[zh_TW]=ç°¡é«”ä¸æ–‡ +Name=Chinese (Simplified) [zh_HK] Name=Chinese (Hong Kong) -Name[be]=КітайÑÐºÐ°Ñ (Гонг-Конг) -Name[bg]=КитайÑки (Хонг Конг) -Name[br]=Sinaeg (Hong Kong) -Name[bs]=Kineski (Hong Kong) -Name[ca]=Xinès (Hong Kong) -Name[cs]=ÄŒÃnský (Hong Kong) -Name[csb]=ChiÅ„sczi (Hong Kong) -Name[da]=Kinesisk (Hong Kong) -Name[de]=Chinesisch (Hongkong) -Name[el]=ΚινÎζικα (Χονγκ Κονγκ) -Name[eo]=Ĉina (Hong Kong) -Name[es]=Chino (Hong Kong) -Name[et]=Hiina (Hong Kong) -Name[eu]=Txinera (Hong Kong) -Name[fa]=چینی)هنگ Ú©Ù†Ú¯( -Name[fi]=Kiina (Hong Kong) -Name[fr]=Chinois (Hong Kong) -Name[fy]=Sjineesk (Hong Kong) -Name[ga]=SÃnis (Hong Cong) -Name[gl]=Chinés (Hong Kong) -Name[he]=×¡×™× ×™×ª (×”×•× ×’ ×§×•× ×’) -Name[hr]=Kineski (Hong Kong) -Name[hu]=KÃnai (hongkongi) -Name[id]=Cina (Hong Kong) -Name[is]=KÃnverska (Hong Kong) -Name[it]=Cinese (Hong Kong) -Name[ja]=ä¸å›½èªž (香港) -Name[ka]=ჩინური (ჰáƒáƒœáƒ’ კáƒáƒœáƒ’ი) -Name[kk]=Қытайша (СÑнган) -Name[km]=áž…áž·áž“ (ហុងកុង) -Name[ku]=Çînî (Hong Kong) -Name[lb]=Chinesesch (Hong Kong) -Name[lt]=KinieÄių (Honkongo) -Name[lv]=ĶīnieÅ¡u (Honkongas) -Name[mk]=КинеÑки (Хонг Конг) -Name[ms]=China (Hong Kong) -Name[nb]=Kinesisk (Hong kong) -Name[nds]=Chineesch (Hong Kong) -Name[ne]=चिनियाठ(हङकङ) -Name[nl]=Chinees (Hong Kong) -Name[nn]=Kinesisk (Hong Kong) -Name[pa]=ਚੀਨੀ (ਹਾਂਗਕਾਂਗ) -Name[pl]=ChiÅ„ski (Hong Kong) -Name[pt]=Chinês (Hong Kong) -Name[pt_BR]=Chinês (Hong Kong) -Name[ro]=Chineză (Hong Kong) -Name[ru]=КитайÑкий (Гонконг) -Name[se]=Kiinnágiella (Hong Kong) -Name[sk]=ÄÃnÅ¡tina (Hongkong) -Name[sl]=kitajsko (Hong Kong) -Name[sr]=КинеÑки (Хонгконг) -Name[sr@Latn]=Kineski (Hongkong) -Name[sv]=Kinesiska (Hong Kong) -Name[te]=చైనీసౠ(హాంగౠకాంగà±) -Name[tg]=Хитоӣ (Гон-Конг) -Name[th]=ภาษาจีี (ฮ่à¸à¸‡à¸à¸‡)น -Name[tr]=Çince (Hong Kong) -Name[uk]=КитайÑька (Гонконг) -Name[uz]=Xitoycha (Gongkong) -Name[uz@cyrillic]=Хитойча (Гонгконг) -Name[vi]=Trung quốc (Hồng Kông) -Name[zh_CN]=ç¹ä½“ä¸æ–‡(香港) -Name[zh_TW]=æ£é«”ä¸æ–‡ï¼ˆé¦™æ¸¯ï¼‰ [zh_TW] -Name=Chinese Traditional -Name[af]=Sjinese tradisioneel -Name[be]=КітайÑÐºÐ°Ñ Ñ‚Ñ€Ð°Ð´Ñ‹Ñ†Ñ‹Ð¹Ð½Ð°Ñ -Name[bg]=КитайÑки традиционен -Name[bn]=পারমà§à¦ªà¦°à¦¿à¦• চৈনিক -Name[br]=Sinaeg da gustum -Name[bs]=Kineski tradicionalni -Name[ca]=Xinès tradicional -Name[cs]=ÄŒÃnský (tradiÄnÃ) -Name[csb]=ChiÅ„sczi Tradicëjny -Name[cy]=Tsieineeg Traddodiadol -Name[da]=Kinesisk traditionel -Name[de]=Chinesisch (traditionelles) -Name[el]=ΚινÎζικα παÏαδοσιακά -Name[eo]=Tradicia Ĉina -Name[es]=Chino tradicional -Name[et]=Hiina (traditsiooniline) -Name[eu]=Txinatar tradizionala -Name[fa]=چینی سنتی -Name[fi]=Perinteinen kiina -Name[fr]=Chinois traditionnel -Name[fy]=Sjineesk (tradisjoniel) -Name[ga]=SÃnis Thraidisiúnta -Name[gl]=Chinés Tradicional -Name[he]=×¡×™× ×™×ª מסורתית -Name[hr]=Kineski tradicionalan -Name[hsb]=Chinsce (tradicionalnje) -Name[hu]=KÃnai (hagyományos) -Name[id]=Cina Tradisional -Name[is]=Hefðbundin kÃnverska -Name[it]=Cinese tradizionale -Name[ja]=ä¸å›½èªž ç¹ä½“å— -Name[ka]=ჩინური ტრáƒáƒ“იციული -Name[kk]=ДәÑтүрлі қытайша -Name[km]=ចិន​បុរាណ -Name[ku]=Çîniya KevneÅŸop -Name[lb]=Traditionellt Chinesesch -Name[lt]=Kinų tradicinÄ— -Name[lv]=ĶīnieÅ¡u tradicionÄlÄ -Name[mk]=КинеÑки традиционален -Name[nb]=Tradisjonell kinesisk -Name[nds]=Traditschonell Chineesch -Name[ne]=चिनियाठपरमà¥à¤ªà¤°à¤¾à¤—त -Name[nl]=Chinees (Traditioneel) -Name[nn]=Kinesisk (tradisjonell) -Name[pa]=ਚੀਨੀ ਮੂਲ -Name[pl]=ChiÅ„ski tradycyjny -Name[pt]=Chinês Tradicional -Name[pt_BR]=Chinês Tradicional -Name[ro]=Chineză tradiÅ£ională -Name[ru]=КитайÑкий (Тайвань) -Name[rw]=Igishinwa Karande -Name[se]=ÃrbevirolaÅ¡ kiinnágiella -Name[sk]=ÄÃnÅ¡tina (tradiÄná) -Name[sl]=tradicionalno kitajsko -Name[sr]=Традиционални кинеÑки -Name[sr@Latn]=Tradicionalni kineski -Name[sv]=Traditionell kinesiska -Name[ta]=சீனம௠பழமையானத௠-Name[te]=సాంపà±à°°à°¦à°¾à°¯à°• చైనీసౠ-Name[tg]=Хитоӣ (Ðнъанавӣ) -Name[th]=ภาษาจีนดั้งเดิม -Name[tr]=Geleneksel Çince -Name[tt]=Çinçä (Ğädäti) -Name[uk]=КитайÑька (традиційна) -Name[uz]=Anʼanaviy Xitoycha -Name[uz@cyrillic]=Ðнъанавий Хитойча -Name[vi]=Trung quốc (truyá»n thống) -Name[zh_CN]=ç¹ä½“ä¸æ–‡ -Name[zh_HK]=ç¹é«”ä¸æ–‡ -Name[zh_TW]=æ£é«”ä¸æ–‡ +Name=Chinese (Traditional) [zu] Name=Zulu -Name[af]=Zoeloe -Name[ar]=الزولو -Name[be]=ЗулуÑÐºÐ°Ñ -Name[bg]=Зулу -Name[bn]=জà§à¦²à§ -Name[br]=Zouloued -Name[csb]=Zulusczi -Name[eo]=Zulua -Name[es]=Zulú -Name[et]=Suulu -Name[eu]=Zuluera -Name[fa]=ناتالی -Name[fr]=Zoulou -Name[ga]=Súlúis -Name[he]=זולו -Name[hi]=ज़à¥à¤²à¥ -Name[is]=Zúlú -Name[ja]=ズールー語 -Name[ka]=ზულუსური -Name[kk]=Зулу -Name[km]=ហ្ស៊ូលូ -Name[ko]=줄루어 -Name[lv]=Zulusu -Name[mk]=Зулу -Name[mn]=Зулу -Name[mt]=Å»ulu -Name[ne]=जà¥à¤²à¥ -Name[nso]=Se-Zulu -Name[pa]=ਜ਼ੂਲੂ -Name[pl]=Zuluski -Name[ru]=ЗулуÑÑкий -Name[rw]=Ikizulu -Name[se]=Zulugiella -Name[sk]=zuluÅ¡tina -Name[sl]=zulu -Name[sr]=Зулу -Name[ss]=SiZulu -Name[ta]=ஜà¯à®²à¯ -Name[te]=జూలౠ-Name[tg]=Зулу -Name[th]=ภาษาซูลู -Name[tt]=Zuluça -Name[uk]=ЗулуÑька -Name[uz]=Zulucha -Name[uz@cyrillic]=Зулуча -Name[ven]=Muzulu -Name[vi]=Xu-lu -Name[wa]=Zoulou -Name[xh]=Isizulu -Name[zh_CN]=祖é²è¯ -Name[zh_HK]=袓é¯èªž -Name[zh_TW]=袓é¯èªž -Name[zu]=Isi-Zulu diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in index d7ef1cd08..8dde23486 100644 --- a/tdecore/configure.in.in +++ b/tdecore/configure.in.in @@ -1,4 +1,4 @@ -dnl Compile in the exec prefix to help kstddirs in finding dynamic libs +dnl Compile in the exec prefix to help tdestandarddirs in finding dynamic libs AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading]) dnl Compile in kde_bindir to safely find tdesu_stub. @@ -169,7 +169,7 @@ AC_CHECK_HEADERS(sys/mount.h) dnl AC_OUTPUT(tdecore/tde-config.cpp) -AM_CONFIG_HEADER(tdecore/kdemacros.h) +AM_CONFIG_HEADER(tdecore/tdemacros.h) SVGICONS= diff --git a/tdecore/eventsrc b/tdecore/eventsrc index 4b2d86226..349c1a921 100644 --- a/tdecore/eventsrc +++ b/tdecore/eventsrc @@ -1,2419 +1,90 @@ [!Global!] IconName=kmenu Comment=System Notifications -Comment[af]=Stelsel Inkennistelling -Comment[ar]=تنبيهات كيدي -Comment[az]=Sistem BildiriÅŸlÉ™ri -Comment[be]=СіÑÑ‚ÑÐ¼Ð½Ñ‹Ñ Ð½Ð°Ð³Ð°Ð´Ð²Ð°Ð½Ð½Ñ– -Comment[bg]=СиÑтемни ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ -Comment[bn]=কে.ডি.ই সিসà§à¦Ÿà§‡à¦® বারà§à¦¤à¦¾à¦¬à¦²à§€ -Comment[br]=Kemennoù ar reizhiad -Comment[bs]=Sistemska obavjeÅ¡tenja -Comment[ca]=Notificacions del sistema -Comment[cs]=Systémová hlášenà prostÅ™edà -Comment[csb]=Systemòwé òdkôzanié w -Comment[cy]=Hysbysiadau Cysawd -Comment[da]=systembekendtgørelser -Comment[de]=Systemnachrichten -Comment[el]=Ειδοποιήσεις συστήματος του -Comment[eo]=Sistematentigoj -Comment[es]=Notificaciones del sistema de -Comment[et]=süsteemi märguanded -Comment[eu]=ren sistemako jakinarazpenak -Comment[fa]=اخطارهای سیستم -Comment[fi]=järjestelmähuomautukset -Comment[fr]=Notifications du système -Comment[fy]=Systeemberjochten -Comment[ga]=Fógairt Chórais -Comment[gl]=Notificacións do Sistema de -Comment[he]=הודעות מערכת של -Comment[hi]=केडीई तंतà¥à¤° सूचना -Comment[hr]=sistemske obavijesti -Comment[hsb]=systemowe powÄ›sće -Comment[hu]=rendszerüzenetek -Comment[id]=Sistem Pemberitahuan -Comment[is]=Tilkynningar kerfisins -Comment[it]=Avvisi di sistema di -Comment[ja]=システム通知 -Comment[ka]=სისტემური შეტყáƒáƒ‘ინებები -Comment[kk]=жүйе құлақтандырулар -Comment[km]=ការ​ជូន​ដំណឹង​អំពី​ប្រពáŸáž“្ធ​របស់ -Comment[ko]=시스템 알림 -Comment[lb]=System-Norichten -Comment[lt]=Sistemos PraneÅ¡imai -Comment[lv]=SistÄ“mas Paziņojumi -Comment[mk]=ÑиÑтемÑки извеÑтувања -Comment[mn]=СиÑтемийн Ñонордуулга -Comment[ms]= Sistem Pemberitahuan -Comment[mt]=Notifiki tas-sistema -Comment[nb]=Systemvarsler -Comment[nds]=Systeemnarichten -Comment[ne]=पà¥à¤°à¤£à¤¾à¤²à¥€ सूचना -Comment[nl]=Systeemnotificaties -Comment[nn]=SystempÃ¥minningar -Comment[nso]=Ditsebiso tsa System ya -Comment[oc]=Notificacions dèu sistemo -Comment[pa]=ਸਿਸਟਮ ਟਿੱਪਣੀਆਂ -Comment[pl]=Powiadamianie systemowe w -Comment[pt]=Mensagens do sistema -Comment[pt_BR]=Notificações de sistema do -Comment[ro]=Sistem de notificare -Comment[ru]=СиÑтемные ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ -Comment[rw]=Amamenyekanisha ya Sisitemu -Comment[se]=vuogádatdieđáhusat -Comment[sk]=Systémové správy -Comment[sl]=Sistemska obvestila -Comment[sq]=Njoftim nga Sistemi -Comment[sr]=ова ÑиÑтемÑка обавештења -Comment[sr@Latn]=ova sistemska obaveÅ¡tenja -Comment[ss]=Tatiso temshini we -Comment[sv]=systemunderrättelser -Comment[ta]=கேடிஇ கணினி அறிவிபà¯à®ªà¯à®•à®³à¯ -Comment[te]=కెడిఈ à°µà±à°¯à°µà°¸à±à°¥ à°ªà±à°°à°•à°Ÿà°¨à°²à± -Comment[tg]=Хабарҳои ÑиÑтемавии -Comment[th]=à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™à¸‚à¸à¸‡à¸£à¸°à¸šà¸š -Comment[tr]=Sistem Bildirimleri -Comment[tt]=nıñ Sistem Beldermäläre -Comment[uk]=СиÑтемні Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ -Comment[uz]=tizimning xabarnomalari -Comment[uz@cyrillic]=тизимнинг хабарномалари -Comment[ven]=U divhadza maitele a -Comment[vi]=Thông báo hệ thống -Comment[wa]=Notifiaedjes sistinme di -Comment[xh]=Izaziso Zendlela ye -Comment[zh_CN]=系统通知 -Comment[zh_HK]=系統通知 -Comment[zh_TW]=系統通知 -Comment[zu]=Izaziso Zesistimu ye [Trash: emptied] Name=Trash: emptied -Name[af]=Gemors: leeggemaak -Name[be]=Сметніца: парожнÑÑ -Name[bg]=Кошчето е изтрито -Name[bn]=আবরà§à¦œà¦¨à¦¾: ফাà¦à¦•à¦¾ -Name[br]=Pod-lastez : goullonderet -Name[bs]=Smeće: ispražnjeno -Name[ca]=Paperera: buida -Name[cs]=KoÅ¡ vyprázdnÄ›n -Name[csb]=Kòsz: wëczëszczony -Name[da]=Affald: tømt -Name[de]=Mülleimer: geleert -Name[el]=Ο Κάδος ΑποÏÏιμμάτων άδειασε -Name[en_GB]=Wastebin: emptied -Name[eo]=Rubujo: Malplena -Name[es]=Papelera: vaciada -Name[et]=Prügikast: tühjendatud -Name[eu]=Zakarrontzia: hustuta -Name[fa]=زباله: خالی‌شده -Name[fi]=Roskakori: tyhjennetty -Name[fr]=Corbeille : vidée -Name[fy]=Jiskefet: leech makke -Name[ga]=Bruscar: folmhaithe -Name[gl]=Lixo: valeirado -Name[he]=×שפה: רוקן -Name[hr]=Otpad: ispražnjeno -Name[hsb]=Papjernik: wuprózdnjeny -Name[hu]=Szemétkosár: kiürÃtve -Name[id]=Tempat Sampah: emptied -Name[is]=Rusl: tæmt -Name[it]=Cestino: svuotato -Name[ja]=ã”ã¿ç®±: 空 -Name[ka]=ურნáƒ: ცáƒáƒ იელირ-Name[kk]=Өшірігендер жойылды -Name[km]=ធុង​សំរាម ៖ បាន​សម្អាហ-Name[lb]=Dreckskëscht: eidel -Name[lt]=Å iukÅ¡liadėžė: iÅ¡tuÅ¡tinta -Name[lv]=Miskaste: iztukÅ¡ota -Name[mk]=Корпа: празна -Name[ms]=Tong Sampah; dikosongkan -Name[nb]=Papirkurven: tømt -Name[nds]=Affalltünn: leddigmaakt -Name[ne]=रदà¥à¤¦à¥€à¤Ÿà¥‹à¤•à¤°à¥€: रितà¥à¤¤à¤¿à¤¯à¥‹ -Name[nl]=Prullenbak: geleegd -Name[nn]=Papirkorg: tømt -Name[pa]=ਰੱਦੀ: ਖਾਲੀ ਕੀਤੀ ਗਈ -Name[pl]=Kosz: opróżniony -Name[pt]=Lixo: esvaziado -Name[pt_BR]=Lixeira: vazia -Name[ro]=Gunoi: golit -Name[ru]=Корзина очищена -Name[rw]=Agatebo: gafite ubusa -Name[se]=Ruskalihtti: gurrejuvvon -Name[sk]=KoÅ¡: vyprázdnený -Name[sl]=Smeti: izpraznjeno -Name[sr]=Смеће: иÑпражњено -Name[sr@Latn]=Smeće: ispražnjeno -Name[sv]=Papperskorg: tömd -Name[ta]=தொடà¯à®Ÿà®¿: காலியாகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ -Name[te]=చెతà±à°¤ : ఖాళి -Name[tg]=Ðхлотдон: тозашуда -Name[th]=ถังขยะ: เททิ้ง -Name[tr]=Çöp: boÅŸaltıldı -Name[tt]=Çüplek: buÅŸatıldı -Name[uk]=Смітник: Ñпорожнено -Name[uz]=Chiqindilar qutisi boÊ»shatildi -Name[uz@cyrillic]=Чиқиндилар қутиÑи бўшатилди -Name[vi]=Rác: đã đổ -Name[zh_CN]=回收站：已清空 -Name[zh_TW]=資æºå›žæ”¶æ¡¶å·²æ¸…空 Comment=The trash has been emptied -Comment[af]=Die gemors is leeggemaak -Comment[be]=Сметніца парожнÑÑ -Comment[bg]=Съдържанието а кошчето е изтрито -Comment[bn]=আবরà§à¦œà¦¨à¦¾à¦° বাকà§à¦¸ ফাà¦à¦•à¦¾ করা হয়েছে -Comment[br]=Goullonderet e oa ar pod-lastez -Comment[bs]=Smeće je ispražnjeno -Comment[ca]=S'ha buidat la paperera -Comment[cs]=KoÅ¡ byl vyprázdnÄ›n -Comment[csb]=Kòsz òstôł wëczëszczony -Comment[da]=Affaldet er blevet tømt ud -Comment[de]=Der Mülleimer wurde geleert -Comment[el]=Ο Κάδος ΑποÏÏιμμάτων άδειασε -Comment[en_GB]=The wastebin has been emptied -Comment[eo]=la rubujo malpleniÄis -Comment[es]=La papelera se ha vaciado -Comment[et]=Prügikast on tühjendatud -Comment[eu]=Zakarrontzia hustu da -Comment[fa]=زباله خالی شده است -Comment[fi]=Roskakori on tyhjennetty -Comment[fr]=La corbeille a été vidée -Comment[fy]=It jiskefet is leech makke -Comment[ga]=FolmhaÃodh an bruscar -Comment[gl]=O lixo foi valeirado -Comment[he]=פה ×”×שפה רוקן -Comment[hr]=Otpad je ispražnjen -Comment[hsb]=sym papjernik wuprózdniÅ‚ -Comment[hu]=A szemétkosár kiürült -Comment[id]=Tempat sampah sudah dikosongkan -Comment[is]=Ruslafatan hefur verið tæmd -Comment[it]=Il cestino è stato svuotato -Comment[ja]=ã”ã¿ç®±ã‚’空ã«ã—ã¾ã—㟠-Comment[ka]=ურნრდáƒáƒªáƒáƒ იელდრ-Comment[kk]=Өшірілгендер қапшық тазарды -Comment[km]=ធុង​សំរាម​ážáŸ’រូវ​បាន​សម្អាហ-Comment[lb]=D'Dreckskëscht ass eidelgemat ginn -Comment[lt]=Å iukÅ¡liadėžė buvo iÅ¡tuÅ¡tinta -Comment[lv]=Miskaste ir iztukÅ¡ota -Comment[mk]=Корпата беше иÑпразнета -Comment[ms]=Tong sampah telah dikosongkan -Comment[nb]=Papirkurven er tømt -Comment[nds]=De Affalltünn wöör leddig maakt -Comment[ne]=रदà¥à¤¦à¥€à¤Ÿà¥‹à¤•à¤°à¥€ रितà¥à¤¤à¤¿à¤à¤•à¥‹ छ -Comment[nl]=De prullenbak is geleegd -Comment[nn]=Papirkorga er tømt -Comment[pa]=ਰੱਦੀ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਜਾ ਚà©à©±à¨•à¨¾ ਹੈ -Comment[pl]=Kosz zostaÅ‚ opróżniony -Comment[pt]=O lixo foi esvaziado -Comment[pt_BR]=A lixeira foi esvaziada -Comment[ro]=CoÅŸul de gunoi a fost golit -Comment[ru]=Корзина была очищена -Comment[rw]=Agatebo kavanywemo byose -Comment[se]=Ruskelihtti gurrejuvvui -Comment[sk]=Kôš bol vyprázdnený -Comment[sl]=Smeti so spraznjene -Comment[sr]=Смеће је иÑпражњено -Comment[sr@Latn]=Smeće je ispražnjeno -Comment[sv]=Papperskorgen har tömts -Comment[ta]=தொடà¯à®Ÿà®¿ காலியாகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ -Comment[te]=చెతà±à°¤ నౠపారబొయటమైనది -Comment[tg]=Ðхлотдон тоза карда шуд -Comment[th]=เทถังขยะทิ้งà¹à¸¥à¹‰à¸§ -Comment[tr]=Çöp boÅŸaltıldı -Comment[tt]=Çüplek buÅŸatılÄŸan buldı -Comment[uk]=Смітник було Ñпорожнено -Comment[uz]=Chiqindilar qutisi boÊ»shatildi -Comment[uz@cyrillic]=Чиқиндилар қутиÑи бўшатилди -Comment[vi]=Rác đã được đổ. -Comment[zh_CN]=回收站已被清空 -Comment[zh_TW]=資æºå›žæ”¶æ¡¶å·²æ¸…空。 default_presentation=1 [Textcompletion: rotation] Name=Textcompletion: rotation -Name[af]=Teksvoltooiïng: rotering -Name[ar]=اكمال نص: تدوير -Name[az]=Textcompletion: döndÉ™rmÉ™ -Name[be]=ЗаканчÑнне Ñ‚ÑкÑту: па колу -Name[bg]=Ðвтоматично завършване: завъртане -Name[bn]=Textcompletion: আবরà§à¦¤à¦¨ -Name[br]=KlokadurSrid : troerezh -Name[bs]=Textcompletion: rotacija -Name[ca]=Compleció de text: rotació -Name[cs]=Doplňovánà textu: rotace -Name[csb]=Dofùlowanié tekstu: rotacëjô -Name[cy]=CwblhauTestun: cylchdroi -Name[da]=Tekstkomplettering: rotation -Name[de]=Textvervollständigung: rotierend -Name[el]=ΣυμπλήÏωση κειμÎνου: πεÏιστÏοφή -Name[eo]=Kkompletigo: rotacio -Name[es]=Completado de texto: rotación -Name[et]=Teksti lõpetamine: pööramine -Name[eu]=Testu-osaketa: biraketa -Name[fa]=تکمیل متن: چرخش -Name[fi]=Tekstintäydennys: pyöritys -Name[fr]=Autocomplètement de texte : rotation -Name[fy]=Tekstkompletearing: rotaasje -Name[ga]=Comhlánú téacs: imchasadh -Name[gl]=Textcompletion: rotación -Name[he]=השלמת טקסט: רוטציה -Name[hi]=टेकà¥à¤¸à¥à¤Ÿ कमà¥à¤ªà¤²à¥€à¤¶à¤¨à¤ƒ रोटेशन -Name[hr]=Textcompletion: rotacija -Name[hsb]=WudospoÅ‚njenje teksta: rotacija -Name[hu]=SzövegkiegészÃtés: forgatás -Name[id]=Pemenuhanteks: rotasi -Name[is]=Textaklárun: snúningur -Name[it]=Completamento testo: rotazione -Name[ja]=テã‚スト補完: 繰り返㗠-Name[ka]=თვითშევსებáƒ: მáƒáƒ¢áƒ იáƒáƒšáƒ”ბრ-Name[kk]=Ðвтотолтыру: бұрау -Name[km]=ការ​បំពáŸáž‰â€‹áž¢ážáŸ’ážáž”ទ ៖ ការ​បង្វិល -Name[ko]=글월 완성: 맴ëŒì´ -Name[lb]=Textergänzung: rotéierent -Name[lt]=Textcompletion: sukimas -Name[lv]=Tekstakomplekts: rotÄcija -Name[mk]=Довршување текÑÑ‚: ротација -Name[mn]=ТекÑÑ‚ гүйцÑÑлт: ÑргүүлÑлт -Name[ms]= Penyudah teks: putaran -Name[mt]=Kompletazzjoni tal-kliem: tidwir -Name[nb]=Tekstfullføring: rotering -Name[nds]=Textkompletteren: dreihen -Name[ne]=पाठसमापà¥à¤¤à¤¿: परिकà¥à¤°à¤®à¤£ -Name[nl]=Tekstaanvulling: rotatie -Name[nn]=Tekstfullføring: rotering -Name[nso]=Phetso ya sengwalwana: tharelo -Name[oc]=Textcompletion: rotacion -Name[pa]=Textcompletion: ਘà©à©°à¨®à¨¾à¨“ -Name[pl]=UzupeÅ‚nianie tekstu: rotacja -Name[pt]=Completação de texto: dei a volta -Name[pt_BR]=Completar Texto: rotação -Name[ro]=Completare text: rotire -Name[ru]=Ðвтозавершение: поворот -Name[rw]=Iyuzuzamwandiko: Ukuzenguruka -Name[se]=TeakstaollaÅ¡uhttin: joraheapmi -Name[sk]=Doplnenie textu:rotácia -Name[sl]=Dopolnjevanje: vrtenje -Name[sq]=Mbarimtekski: rrotullim -Name[sr]=Допуњавање текÑта: ротација -Name[sr@Latn]=Dopunjavanje teksta: rotacija -Name[ss]=Kucedzelwa kwembhalo:kujikeleta -Name[sv]=Textkomplettering: rotation -Name[ta]=உரைநிறைவà¯: சà¯à®´à®±à¯à®šà®¿ -Name[te]=వాచకపూరణ:à°à±à°°à°®à°£à°‚ -Name[tg]=Худхотимадиҳӣ: гардиш -Name[th]=à¸à¸²à¸£à¹€à¸•à¸´à¸¡à¸‚้à¸à¸„วามให้สมบูรณ์: à¸à¸²à¸£à¸«à¸¡à¸¸à¸™ -Name[tr]=Textcompletion: çevirme -Name[tt]=Süzazağı: äyländerü -Name[uk]=Ð”Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту: Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ -Name[uz]=Matnni tugatish: qaytarish -Name[uz@cyrillic]=Матнни тугатиш: қайтариш -Name[ven]=U fhela ha manwalwa: U mona -Name[vi]=Nháºp xong từ: xoay -Name[xh]=Textcompletion: ujikeleziso -Name[zh_CN]=æ–‡å—è¡¥é½ï¼šè½®è½¬ -Name[zh_HK]=æ–‡å—補齊：旋轉 -Name[zh_TW]=æ–‡å—補齊：旋轉 -Name[zu]=Ukuqedwa kombhalo:ukujikelezisa Comment=The end of the list of matches has been reached -Comment[af]=Die einde van die lys van ooreenkomste is bereik -Comment[be]=ДаÑÑгнуты канец ÑпіÑа ÑупаданнÑÑž -Comment[bg]=ДоÑтигнат е ÐºÑ€Ð°Ñ Ð½Ð° ÑпиÑъка от ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ -Comment[bn]=মিলের তালিকার শেষে উপসà§à¦¥à¦¿à¦¤ -Comment[br]=Tizhet eo diwezh roll ar gendoareoù -Comment[bs]=DoÅ¡ao sam do kraja liste pogodaka -Comment[ca]=S'ha arribat al final de la llista de coincidències -Comment[cs]=Dosaženo konce seznamu odpovÃdajÃcÃch položek -Comment[csb]=Je doszłé do kùńca lëstë dopasowaniów -Comment[da]=Slutningen pÃ¥ listen over det fundne er nÃ¥et -Comment[de]=Das Ende der Liste mit Ãœbereinstimmungen wurde erreicht -Comment[el]=Φτάσαμε στο Ï„Îλος της λίστας με τα ταιÏιάσματα -Comment[eo]=Fino de la listo de kongruaĵoj -Comment[es]=Se ha alcanzado el final de la lista de concordancias -Comment[et]=Jõuti kokkulangevuste nimekirja lõppu -Comment[eu]=Bat datozenen zerrendaren amaierara iritsi da -Comment[fa]=به پایان Ùهرست تطبیقها رسیده است -Comment[fi]=Osumalistan loppu saavutettu -Comment[fr]=La fin de la liste des correspondances a été atteinte -Comment[fy]=It ein fan de oerienkomstenlist is berikt -Comment[gl]=Chegou-se á fin da lista de coincidéncias. -Comment[he]=הגיעו לסוף רשימת ההת×מות -Comment[hi]= मिलान सूची का अंतिम आ पंहà¥à¤šà¤¾. -Comment[hr]=Stiglo se do zavrÅ¡etka popisa podudarnosti -Comment[hsb]=Sym na kóncu lisćiny namakankow -Comment[hu]=A találatok listájának végére értem -Comment[id]=Akhir daftar pencocokan telah dicapai -Comment[is]=Enda listans yfir atriði sem passa náð -Comment[it]=È stata raggiunta la fine della lista delle corrispondenze -Comment[ja]=マッãƒãƒªã‚¹ãƒˆã®çµ‚端ã«é”ã—ã¾ã—㟠-Comment[ka]=თáƒáƒœáƒ®áƒ•áƒ”დრáƒáƒ—რსიის ბáƒáƒšáƒ. -Comment[kk]=СайкеÑтіктер тізімі Ñоңына жетті -Comment[km]=បាន​ទៅ​ដល់​ចុង​បញ្ចប់​នៃ​បញ្ជី​ដំណូច -Comment[lb]=D'Enn vun der Lëscht mat den Iwwerteneestëmmungen ass erreecht ginn -Comment[lt]=Pasiektas atitikmenų sÄ…raÅ¡o galas -Comment[lv]=Sasniegtas atbilstÄ«bu saraksta beigas -Comment[mk]=ДоÑтигнат е крајот на лиÑтата на Ñовпаѓања -Comment[ms]=Sampai ke akhiran senarai padanan -Comment[nb]=Har kommet til slutten av lista over treff -Comment[nds]=Dat is dat Enn vun de List mit Övereenstimmen -Comment[ne]=मिलà¥à¤¦à¥‹ सूचीको अनà¥à¤¤à¥à¤¯à¤®à¤¾ पà¥à¤—िà¤à¤•à¥‹ छ -Comment[nl]=Het einde van de lijst met overeenkomsten is bereikt -Comment[nn]=Slutten av trefflista er nÃ¥dd -Comment[pa]=ਮੇਲ ਸੂਚੀ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ -Comment[pl]=OsiÄ…gniÄ™to koniec listy dopasowaÅ„ -Comment[pt]=O fim da lista de escolhas foi atingido -Comment[pt_BR]=O fim da lista de coincidências foi atingido -Comment[ro]=Am ajuns la sfîrÅŸitul listei de potriviri -Comment[ru]=ДоÑтигнут конец ÑпиÑка Ñовпадений. -Comment[rw]=Impera y'urutonde rw'ibihura yagezweho -Comment[se]=Ollii gávdnosiid listtu lohppii -Comment[sk]=Bol dosiahnutý koniec zoznamu nájdených položiek -Comment[sl]=To je konec seznama zadetkov -Comment[sr]=ДоÑтигнут је крај лиÑте подударања -Comment[sr@Latn]=Dostignut je kraj liste podudaranja -Comment[sv]=Slutet pÃ¥ listan med träffar har nÃ¥tts -Comment[ta]=பொரà¯à®¤à¯à®¤à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®©à¯ à®®à¯à®Ÿà®¿à®µà¯ˆ அடைநà¯à®¤à®¾à®¯à®¿à®±à¯à®±à¯. -Comment[te]=జతల జాబితా చివరకౠచేరà±à°•à±à°¨à±à°¨à°®à± -Comment[tg]=Охири рӯйхати мувофиқат раÑид -Comment[th]=ถึงส่วนท้ายขà¸à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸—ี่เข้าคู่ได้à¹à¸¥à¹‰à¸§ -Comment[tr]=EÅŸleÅŸme listesinin sonuna gelindi -Comment[tt]=Kileşülär tezmäseneñ azağına cittek -Comment[uk]=ДоÑÑгнуто кінець ÑпиÑку збігань -Comment[uz]=Mos keladigan elementlar roÊ»yxatining oxiri -Comment[uz@cyrillic]=ÐœÐ¾Ñ ÐºÐµÐ»Ð°Ð´Ð¸Ð³Ð°Ð½ Ñлементлар рўйхатининг охири -Comment[vi]=Má»›i tá»›i kết thúc của danh sách từ khá»›p. -Comment[zh_CN]=已到达匹é…é¡¹åˆ—è¡¨çš„æœ€åŽ -Comment[zh_TW]=符åˆæ¢ä»¶çš„列表已經到çµå°¾äº†ã€‚ default_presentation=1 [Textcompletion: no match] Name=Textcompletion: no match -Name[af]=Teksvoltooiïng: nee ooreenstem -Name[ar]=اكمال نص: لا يوجد تماثل -Name[az]=Textcompletion: oxÅŸarı Yoxdur -Name[be]=ЗаканчÑнне Ñ‚ÑкÑту: нÑма ÑупаданнÑÑž -Name[bg]=Ðвтоматично завършване: нÑма Ñъвпадение -Name[bn]=Textcompletion: কোনো মিল পাওয়া যায়নি -Name[br]=KlokadurSrid : kendoare ebet -Name[bs]=Textcompletion: bez poklapanja -Name[ca]=Compleció de text: cap coincidència -Name[cs]=Doplňovánà textu: žádná shoda -Name[csb]=Dofùlowanié tekstu: felënk dopasowaniô -Name[cy]=CwblhauTestun: cydweddiad -Name[da]=Tekstkomplettering: intet fundet -Name[de]=Textvervollständigung: keine Ãœbereinstimmung -Name[el]=ΣυμπλήÏωση κειμÎνου: κανÎνα ταίÏιασμα -Name[eo]=Kkompletigo: neniu trovaĵo -Name[es]=Completado de texto: no hay concordancias -Name[et]=Teksti lõpetamine: kokkulangevus puudub -Name[eu]=Testu-osaketa: ez dago bat datorrenik -Name[fa]=تکمیل متن: بدون تطبیق -Name[fi]=Tekstintäydennys: ei osumia -Name[fr]=Autocomplètement de texte : aucune correspondance -Name[fy]=Tekstkompletearing - gjin oerienkomst -Name[ga]=Comhlánú téacs: nÃl aon rud inchurtha -Name[gl]=Textcompletion: sen coincidéncia -Name[he]=השלמת טקסט: ×ין הת×מה -Name[hi]=टेकà¥à¤¸à¥à¤Ÿ कमà¥à¤ªà¤²à¥€à¤¶à¤¨à¤ƒ मिलान नहीं -Name[hr]=Textcompletion: bez poklapanja -Name[hsb]=WudospoÅ‚njenje teksta: njejsym niÄo namakaÅ‚ -Name[hu]=SzövegkiegészÃtés: nincs találat -Name[id]=Pemenuhanteks: tidak ada yang cocok -Name[is]=Textaklárun: ekkert passar -Name[it]=Completamento testo: nessuna corrispondenza -Name[ja]=テã‚スト補完: マッãƒãªã— -Name[ka]=თვითშევსებáƒ: თáƒáƒœáƒ®áƒ•áƒ”დრები áƒáƒ áƒáƒ ის -Name[kk]=Ðвтотолтыру: ÑәйкеÑтік жоқ -Name[km]=ការ​បំពáŸáž‰â€‹áž¢ážáŸ’ážáž”ទ ៖ គ្មាន​ដំណូច -Name[ko]=글월 완성: 맞는 ì§ì´ ì—†ìŒ -Name[lb]=Textergänzung: keng Iwwerteneestëmmung -Name[lt]=Textcompletion: netinka -Name[lv]=Tekstakomplekts: nav atbilstÄ«bu -Name[mk]=Довршување текÑÑ‚: нема Ñовпаѓања -Name[mn]=ТекÑÑ‚ гүйцÑÑлт: Харьцуулалтгүй -Name[ms]= Penyudah teks: tiada padanan -Name[mt]=Kompletazzjoni tal-kliem: ebda qbil -Name[nb]=Tekstfullføring: ingen treff -Name[nds]=Textkompletteren: nix passt -Name[ne]=पाठसमापà¥à¤¤à¤¿: बेमेल -Name[nl]=Tekstaanvulling - geen overeenkomsten -Name[nn]=Tekstfullføring: ingen treff -Name[nso]=Phetso ya sengwalwana: gagona tshwanelano -Name[oc]=Textcompletion: a pas res de coincidencia -Name[pa]=Textcompletion: ਕੋਈ ਮੇਲ ਨਹੀ -Name[pl]=UzupeÅ‚nianie tekstu: brak dopasowania -Name[pt]=Completação de texto: nenhuma encontrada -Name[pt_BR]=Completar Texto: nenhuma coincidência -Name[ro]=Completare text: nici o potrivire -Name[ru]=Ðвтозавершение: нет Ñовпадений -Name[rw]=Iyuzuzamwandiko: nta bihura -Name[se]=TeakstaollaÅ¡uhttin: ii gávdnon -Name[sk]=Doplnenie textu: žiadna zhoda -Name[sl]=Dopolnjevanje: ni ujemanja -Name[sq]=Mabrimteksti: nuk ka përputhje -Name[sr]=Допуњавање текÑта: нема поклапања -Name[sr@Latn]=Dopunjavanje teksta: nema poklapanja -Name[ss]=Kucedzelwa kwembhalo:akukho kuhambelana -Name[sv]=Textkomplettering: ingen träff -Name[ta]=உரைநிறைவà¯: பொரà¯à®¤à¯à®¤à®®à®¿à®²à¯à®²à¯ˆ -Name[te]=వాచకపూరణ:జత లేదౠ-Name[tg]=Худхотимадиҳӣ: номуноÑиб -Name[th]=à¸à¸²à¸£à¹€à¸•à¸´à¸¡à¸‚้à¸à¸„วามให้สมบูรณ์: ไม่เข้าคู่ -Name[tr]=Textcompletion: eÅŸleÅŸme Yok -Name[tt]=Süzazağı: kileÅŸkäne yuq -Name[uk]=Ð”Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту: немає відповідних значень -Name[uz]=Matnni tugatish: mos keladigan yoÊ»q -Name[uz@cyrillic]=Матнни тугатиш: Ð¼Ð¾Ñ ÐºÐµÐ»Ð°Ð´Ð¸Ð³Ð°Ð½ йўқ -Name[ven]=U fhela ha manwalwa: A huna u fanyisa -Name[vi]=Nháºp xong từ: không khá»›p -Name[xh]=Textcompletion: akukho ntelekiso -Name[zh_CN]=æ–‡å—è¡¥é½ï¼šæ²¡æœ‰åŒ¹é… -Name[zh_HK]=æ–‡å—è£œé½Šï¼šæ²’æœ‰åŒ¹é… -Name[zh_TW]=æ–‡å—è£œé½Šï¼šæ²’æœ‰åŒ¹é… -Name[zu]=Ukuqedwa kokumbhalo: akukho okufanayo Comment=No matching completion was found -Comment[af]=Geen ooreenstemming was gevind -Comment[be]=ÐÑма варыÑнтаў заканчÑÐ½Ð½Ñ -Comment[bg]=Ðе е намерено Ñъвпадение -Comment[bn]=কোনো যà§à¦¤à¦¸à¦‡ পরিপূরক পাওয়া যায় নি -Comment[br]=Kendoare ebet na voe kavet -Comment[bs]=Nijedno dovrÅ¡avanje nije pronaÄ‘eno -Comment[ca]=No s'ha trobat cap coincidència completable -Comment[cs]=Nenalezeno žádné vhodné doplnÄ›nà -Comment[csb]=Dopasowanié nie òstałó nalazłé -Comment[da]=Ingen passende komplettering blev fundet -Comment[de]=Keine passende Ergänzung gefunden -Comment[el]=Δε βÏÎθηκε συμπλήÏωση που να ταιÏιάζει -Comment[eo]=Ne troviÄis konvena kompletigo. -Comment[es]=No se encontró ningún completado concordante -Comment[et]=Kokkulangevat lõppu ei leitud -Comment[eu]=Ez da bat datorren osaketarik aurkitu -Comment[fa]=تکمیل مطابق پیدا نشد -Comment[fi]=Ei osumia täydennettäväksi -Comment[fr]=Aucune possibilité d'auto-complètement trouvée -Comment[fy]=gjin oerienkomstige kompletearings binne fun -Comment[gl]=Non se atopou nengunha completado coincidente. -Comment[he]=×œ× × ×ž×¦××” ××£ השלמה תו×מת -Comment[hi]=कोई मैचिंग कमà¥à¤ªà¥à¤²à¥€à¤¶à¤¨ नहीं मिला -Comment[hr]=Nije pronaÄ‘ena nijedna podudarnost -Comment[hsb]=Žane wudospoÅ‚njenje so njehodźi -Comment[hu]=Nem található megfelelÅ‘ kiegészÃtés -Comment[id]=Tidak ada pelengkapan yang cocok -Comment[is]=Ekkert passar -Comment[it]=Nessun completamento corrispondente trovato -Comment[ja]=マッãƒã™ã‚‹è£œå®Œã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠-Comment[ka]=თáƒáƒœáƒ®áƒ•áƒ”დერები ვერმáƒáƒ˜áƒ«áƒ”ბნáƒ. -Comment[kk]=СәйкеÑтік жоқ -Comment[km]=រក​មិន​ឃើញ​ការ​បំពáŸáž‰â€‹ážŠáŸ‚ល​ដូច -Comment[lb]=Et gouf keng passend Ergänzung fonnt -Comment[lt]=Nerasta atitinkanti pabaiga -Comment[lv]=AtbilstoÅ¡a pabeigÅ¡ana netika atrasta -Comment[mk]=Ðе е најдено Ñовпаѓање -Comment[ms]=Tiada padanan lengkapan ditemui -Comment[nb]=Ingen passende fullføring funnet -Comment[nds]=Dor passt nix -Comment[ne]=बेमेल समापà¥à¤¤à¤¿ फेला पारेको थियो -Comment[nl]=Er werd geen overeenkomstige aanvulling gevonden -Comment[nn]=Ingen passande fullføring funne -Comment[pa]=ਸਮਾਪਤੀ ਤੱਕ ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱà¨à¨¾ -Comment[pl]=Nie znaleziono dopasowania -Comment[pt]=Não foi encontrada qualquer completação -Comment[pt_BR]=Nenhuma coincidência foi encontrada -Comment[ro]=Nu am găsit nimic potrivit -Comment[ru]=Ðе найдено Ñовпадений. -Comment[rw]=Nta yuzuza rihura ryabonetse -Comment[se]=HeivvolaÅ¡ ollaÅ¡uhttin ii gávdnon -Comment[sk]=Žiadna zhoda nebola nájdená -Comment[sl]=Ni najti ujemajoÄih se zadetkov -Comment[sr]=Подударна допуна није пронађена -Comment[sr@Latn]=Podudarna dopuna nije pronaÄ‘ena -Comment[sv]=Ingen matchande komplettering hittades -Comment[ta]=பொரà¯à®¤à¯à®¤à®®à®¾à®© நிறைவ௠à®à®¤à¯à®®à®¿à®²à¯à®²à¯ˆ. -Comment[te]=సరిపోయె జత దొరకలేదౠ-Comment[tg]=Ягон мувофиқат Ñ‘Ñ„Ñ‚ нашуд -Comment[th]=ไม่พบส่วนเติมข้à¸à¸„วามที่เข้าคู่ -Comment[tr]=EÅŸleÅŸme bulunamadı -Comment[tt]=KileÅŸkän azaqlar tabılmadı -Comment[uk]=Відповідного Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð½Ðµ знайдено -Comment[uz]=Mos keladigan tugatish topilmadi -Comment[uz@cyrillic]=ÐœÐ¾Ñ ÐºÐµÐ»Ð°Ð´Ð¸Ð³Ð°Ð½ тугатиш топилмади -Comment[vi]=Không tìm thấy. -Comment[zh_CN]=没有找到匹é…的补全项 -Comment[zh_HK]=找ä¸åˆ°å®Œå…¨åŒ¹é…çš„é …ç›® -Comment[zh_TW]=找ä¸åˆ°å®Œå…¨åŒ¹é…çš„é …ç›®ã€‚ default_presentation=1 [Textcompletion: partial match] Name=Textcompletion: partial match -Name[af]=Teksvoltooiïng: gedeeltelike ooreenstem -Name[ar]=اكمال نص: تماثل جزئي -Name[az]=Textcompletion: qismi oxÅŸar -Name[be]=ЗаканчÑнне Ñ‚ÑкÑту: чаÑтковае Ñупаданне -Name[bg]=Ðвтоматично завършване: чаÑтично Ñъвпадение -Name[bn]=Textcompletion: আংশিক মিল -Name[br]=KlokadurSrid : kendoare darnek -Name[bs]=Textcompletion: djelomiÄno poklapanje -Name[ca]=Compleció de text: coincidència parcial -Name[cs]=Doplňovánà textu: ÄásteÄná shoda -Name[csb]=Dofùlowanié tekstu: dzélowé dopasowanié -Name[cy]=CwblhauTestun: cydweddiad rhannol -Name[da]=Tekstkomplettering: delvist fundet -Name[de]=Textvervollständigung: teilweise Ãœbereinstimmung -Name[el]=ΣυμπλήÏωση κειμÎνου: μεÏικό ταίÏιασμα -Name[eo]=Kkompletigo: parta trovaĵo -Name[es]=Completado de texto: concordancia parcial -Name[et]=Teksti lõpetamine: osaline kokkulangevus -Name[eu]=Testu-osaketa: bat datorren partziala -Name[fa]=تکمیل متن: تطبیق جزیی -Name[fi]=Tekstintäydennys: osittainen osuma -Name[fr]=Autocomplètement de texte : correspondance partielle -Name[fy]=Tekstkompletearing - foar in diel oerienkommend -Name[ga]=Comhlánú téacs: inchurtha i bpáirt -Name[gl]=Textcompletion: coincidéncia parcial -Name[he]=השלמת טקסט: הת×מה חלקית -Name[hi]=टेकà¥à¤¸à¥à¤Ÿ कमà¥à¤ªà¤²à¥€à¤¶à¤¨à¤ƒ अधूरा मिलान -Name[hr]=Textcompletion: djelomiÄno poklapanje -Name[hsb]=WudospoÅ‚njenje teksta: dźělne kryće -Name[hu]=SzövegkiegészÃtés: részleges találat -Name[id]=Pemenuhanteks: cocok sebagian -Name[is]=Textaklárun: passar næstum þvà -Name[it]=Completamento testo: corrispondenza parziale -Name[ja]=テã‚スト補完: 部分的ã«ãƒžãƒƒãƒ -Name[ka]=თვითშევსებáƒ: ნáƒáƒ¬áƒ˜áƒšáƒáƒ‘რივი თáƒáƒœáƒ®áƒ•áƒ”დრრ-Name[kk]=Ðвтотолтыру: жарты-жарым ÑәйкеÑтік -Name[km]=ការ​បំពáŸáž‰â€‹áž¢ážáŸ’ážáž”ទ ៖ ដូច​ážáŸ’លះៗ -Name[ko]=글월 완성: ë¶€ë¶„ì€ ì§ì´ ë§žìŒ -Name[lb]=Textergänzung: deelweis Iwwerteneestëmmung -Name[lt]=Textcompletion: tinka dalinai -Name[lv]=Tekstakomplekts: daļēja atbilstÄ«ba -Name[mk]=Довршување текÑÑ‚: делумни Ñовпаѓања -Name[mn]=ТекÑÑ‚ гүйцÑÑлт: Ð¥Ð°Ð³Ð°Ñ Ñ…Ð°Ñ€ÑŒÑ†ÑƒÑƒÐ»Ð°Ð»Ñ‚Ñ‚Ð°Ð¹ -Name[ms]= Penyudah teks: separa padanan -Name[mt]=Kompletazzjoni tal-kliem: qbil parzjali -Name[nb]=Tekstfullføring: delvis treff -Name[nds]=Textkompletteren: passt deelwies -Name[ne]=पाठसमापà¥à¤¤à¤¿: आंशिक मिलà¥à¤¯à¥‹ -Name[nl]=Tekstaanvulling - gedeeltelijke overeenkomsten -Name[nn]=Tekstfullføring: delvis treff -Name[nso]=Phetso ya sengwalwana: tshwanelanyo dikarolong tse rilego -Name[oc]=Textcompletion: coincidencia parciala -Name[pa]=Textcompletion: ਅਧੂਰਾ ਮਿਲਾਨ -Name[pl]=UzupeÅ‚nianie tekstu: częściowe dopasowanie -Name[pt]=Completação de texto: parcial -Name[pt_BR]=Completar Texto: coincidência parcial -Name[ro]=Completare text: potrivire parÅ£ială -Name[ru]=Ðвтозавершение: чаÑтичное Ñовпадение -Name[rw]=Iyuzuzamwandiko: uguhura kutuzuye -Name[se]=TaekstaollaÅ¡uhttin: oasil gávdnui -Name[sk]=Doplnenie textu: ÄiastoÄná zhoda -Name[sl]=Dopolnjevanje: delno ujemanje -Name[sq]=Mbarimteksti: përputhje e pjesërishme -Name[sr]=Допуњавање текÑта: делимично поклапање -Name[sr@Latn]=Dopunjavanje teksta: delimiÄno poklapanje -Name[ss]=Kucedzelwa kwembhalo:kuhambelana lokungakapheleli -Name[sv]=Textkomplettering: delvis träff -Name[ta]=உரைநிறைவà¯: கà¯à®±à¯ˆà®ªà¯ பொரà¯à®¤à¯à®¤à®®à¯ -Name[te]=వాచకపూరణ: పాకà±à°·à°¿à°• జత -Name[tg]=Худхотимадиҳӣ: мувофиқати қиÑмӣ -Name[th]=à¸à¸²à¸£à¹€à¸•à¸´à¸¡à¸‚้à¸à¸„วามให้สมบูรณ์: เข้าคู่บางส่วน -Name[tr]=Textcompletion: kısmi eÅŸleÅŸme -Name[tt]=Süzazağı: öleşçä kileÅŸkän -Name[uk]=Ð”Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту: чаÑткове Ð·Ð±Ñ–Ð³Ð°Ð½Ð½Ñ -Name[uz]=Matnni tugatish: qisman mos kelish -Name[uz@cyrillic]=Матнни тугатиш: қиÑман Ð¼Ð¾Ñ ÐºÐµÐ»Ð¸Ñˆ -Name[ven]=U fhela ha manwalwa: U elana hu tukunyana -Name[vi]=Nháºp xong từ: khá»›p bá»™ phạn -Name[xh]=Ugqibeko lokubhaliweyo: intelekiso engaphelelanga -Name[zh_CN]=æ–‡å—è¡¥é½ï¼šéƒ¨åˆ†åŒ¹é… -Name[zh_HK]=æ–‡å—è£œé½Šï¸°éƒ¨åˆ†åŒ¹é… -Name[zh_TW]=æ–‡å—è£œé½Šï¸°éƒ¨åˆ†åŒ¹é… -Name[zu]=Ukuqedwa kokubhaliweyo: ukufaniswa kwesikhashana Comment=There is more than one possible match -Comment[af]=Daar is meer as een moontlik ooreenkoms -Comment[be]=Знойдзена некалькі варыÑнтаў заканчÑÐ½Ð½Ñ -Comment[bg]=Ðамерени Ñа повече от едно Ñъвпадение -Comment[bn]=à¦à¦•à¦¾à¦§à¦¿à¦• সমà§à¦à¦¾à¦¬à§à¦¯ পরিপূরক বরà§à¦¤à¦®à¦¾à¦¨ -Comment[br]=Tremen ur c'hendoare a zo -Comment[bs]=Postoji viÅ¡e od jednog mogućeg pogotka -Comment[ca]=Hi ha més d'una possible coincidència -Comment[cs]=Existuje vÃce vhodných odpovÃdajÃcÃch položek -Comment[csb]=Je wicy jak jedno dopasowanié -Comment[da]=Der er mere end en mulighed -Comment[de]=Mehr als eine mögliche Ergänzung vorhanden -Comment[el]=ΥπάÏχουν πεÏισσότεÏες από μία δυνατÎÏ‚ συμπληÏώσεις -Comment[eo]=Ekzistas pli ol unu konvena trovaĵo. -Comment[es]=Hay más de una posible concordancia -Comment[et]=Võimalike variante on rohkem kui üks -Comment[eu]=Bat datorrenak bat baino gehiago dira -Comment[fa]=بیش از یک تطبیق ممکن وجود دارد -Comment[fi]=Useampia mahdollisia osumia -Comment[fr]=Au moins deux correspondances ont été trouvées -Comment[fy]=Der is wierskynlik mear as ien oerienkomst -Comment[gl]=Hai máis dunha coincidéncia posÃbel -Comment[he]=יש יותר מהת×מה ×פשרית ×חת -Comment[hi]=वहाठपर à¤à¤• से अघिक संà¤à¤µ जोड़ मिले हैं -Comment[hr]=Postoji viÅ¡e od jedne moguće podudarnosti -Comment[hsb]=Wjace haÄ jedne móžne wudospoÅ‚njenje -Comment[hu]=Egynél több lehetséges kiegészÃtés van -Comment[id]=Lebih dari satu kemungkinan cocok -Comment[is]=Það eru fleiri en eitt atriði sem passar -Comment[it]=C'è più di una corrispondenza possibile -Comment[ja]=マッãƒã™ã‚‹ã‚‚ã®ãŒè¤‡æ•°ã‚ã‚Šã¾ã™ -Comment[ka]=მáƒáƒ˜áƒ«áƒ”ბნრერთზე მეტი თáƒáƒœáƒ®áƒ•áƒ”დრáƒ. -Comment[kk]=Бірден артық ÑәйкеÑтік бар -Comment[km]=អាច​មាន​ដំណូច​ច្រើន​ជាង​មួយ -Comment[lb]=Et gëtt méi wéi eng méiglech Iwwerteneestëmmung -Comment[lt]=Yra daugiau negu vienas galimas atitikmuo -Comment[lv]=Å eit ir vairÄk kÄ viena iespÄ“jamÄ atbilstÄ«ba -Comment[mk]=ПоÑтојат повеќе од едно Ñовпаѓање -Comment[ms]=Ada lebih dari satu kebarangkalian padanan. -Comment[nb]=Det er mer enn ett mulig treff -Comment[nds]=Dor passt mehr as een -Comment[ne]=तà¥à¤¯à¤¹à¤¾à¤ à¤à¤• à¤à¤¨à¥à¤¦à¤¾ बढी समà¥à¤à¤µ जोडा छनॠ-Comment[nl]=Er is meer dan één mogelijke overeenkomst -Comment[nn]=Det er meir enn eitt mogleg treff -Comment[pa]=ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਮੇਲ ਉਪਲੱਬਧ ਹਨ -Comment[pl]=Jest wiÄ™cej niż jedno dopasowanie -Comment[pt]=Há mais do que uma completação possÃvel -Comment[pt_BR]=Há mais de uma opção possÃvel -Comment[ro]=Există mai mult de o potrivire posibilă -Comment[ru]=Ðайдено более чем одно Ñовпадение. -Comment[rw]=Hari uguhura kurenga kumwe gushoboka -Comment[se]=Leat eanet go ovtta vejolaÅ¡ gávdnus -Comment[sk]=Existuje viac ako jedna zhoda -Comment[sl]=MogoÄ je veÄ kakor en zadetek -Comment[sr]=ПоÑтоји више од једног могућег подударања -Comment[sr@Latn]=Postoji viÅ¡e od jednog mogućeg podudaranja -Comment[sv]=Det finns mer än en möjlig träff -Comment[ta]=ஒனà¯à®±à¯à®•à¯à®•à¯ மேறà¯à®ªà®Ÿà¯à®Ÿ பொரà¯à®¤à¯à®¤à®™à¯à®•à®³à¯ உளà¯à®³à®©. -Comment[te]=à°’à°•à°Ÿà°¿ కంటె à°Žà°•à±à°•à±à°µ సరిపోయె జతలౠకలవౠ-Comment[tg]=Зиёд аз Ñк мувофиқат Ñ‘Ñ„Ñ‚ шуд -Comment[th]=มีส่วนที่เข้าคู่ได้à¸à¸¢à¸¹à¹ˆà¸¡à¸²à¸à¸à¸§à¹ˆà¸²à¸«à¸™à¸¶à¹ˆà¸‡ -Comment[tr]=Birden fazla muhtemel eÅŸleÅŸme var -Comment[tt]=KileÅŸkäne berdän dä kübkär -Comment[uk]=Більше одного відповідного Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ -Comment[uz]=Bittadan koÊ»p moslik topildi -Comment[uz@cyrillic]=Биттадан кўп моÑлик топилди -Comment[vi]=Khá»›p nhiá»u từ. -Comment[zh_CN]=有多于一个的å¯èƒ½åŒ¹é…项 -Comment[zh_HK]=匹é…çš„å¯èƒ½æ€§å¤šæ–¼ä¸€å€‹ -Comment[zh_TW]=有多於一個的å¯èƒ½åŒ¹é…é …ã€‚ default_presentation=1 [cannotopenfile] Name=Cannot Open File -Name[af]=Kan nie Open Lêer -Name[ar]=لا أستطيع ÙØªØ Ø§Ù„Ù…Ù„Ù -Name[az]=Fayl Açıla bilmir -Name[be]=Ðемагчыма адкрыць файл -Name[bg]=Ðе може да Ñе отвори файла -Name[bn]=ফাইল খোলা যাচà§à¦›à§‡ না -Name[br]=N'hall ket digeriñ restr -Name[bs]=Ne mogu otvoriti datoteku -Name[ca]=No es pot obrir el fitxer -Name[cs]=Nenà možné otevÅ™Ãt soubor -Name[csb]=Nie je mòżno òtemknÄ…c lopkù -Name[cy]=Methu Agor y Ffeil -Name[da]=Kan ikke Ã¥bne fil -Name[de]=Datei lässt sich nicht öffnen -Name[el]=Δεν είναι δυνατό το άνοιγμα του αÏχείου -Name[eo]=Ne eblas malfermi dosieron -Name[es]=No se puede abrir archivo -Name[et]=Faili avamine ebaõnnestus -Name[eu]=Ezin da fitxategia ireki -Name[fa]=نمی‌توان پرونده را باز کرد -Name[fi]=Ei voitu avata tiedostoa -Name[fo]=Kann ikki opna fÃla -Name[fr]=Impossible d'ouvrir un fichier -Name[fy]=Kin de triem net iepenje -Name[ga]=Nà Féidir an Comhad a Oscailt -Name[gl]=Non se pode abrir a ficheiro -Name[he]=×ין ×פשרות לפתוח קובץ -Name[hi]=फ़ाइल खोल नहीं सका -Name[hr]=Datoteku nije moguće otvoriti -Name[hsb]=Njemóžu dataju woÄinić -Name[hu]=Nem sikerült megnyitni a fájlt -Name[id]=Tidak Dapat Membuka Berkas -Name[is]=Get ekki opnað skrá -Name[it]=Impossibile aprire il file -Name[ja]=ファイルを開ã‘ã¾ã›ã‚“ -Name[ka]=ფáƒáƒ˜áƒšáƒ˜áƒ¡ გáƒáƒ®áƒ¡áƒœáƒ ვერხერხდებრ-Name[kk]=Файл ашылмайды -Name[km]=មិន​អាច​បើក​ឯកសារ -Name[ko]=파ì¼ì„ 열지 못함 -Name[lb]=Kann d'Datei net opmaachen -Name[lt]=Nepavyksta atverti bylos -Name[lv]=Nevar AtvÄ“rt Failu -Name[mi]=Kaua i te Puare Könae -Name[mk]=Ðе може да Ñе отвори датотеката -Name[mn]=Файл нÑÑгдÑхгүй байна -Name[ms]=Tidak boleh Buka Fail -Name[mt]=Ma jistax jinfetaħ fajl -Name[nb]=Kan ikke Ã¥pne fil -Name[nds]=Datei lett sik nich opmaken -Name[ne]=फाइल खोलà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ -Name[nl]=Kan het bestand niet openen -Name[nn]=Kan ikkje opna fil -Name[nso]=Ekase Bule Faele -Name[oc]=Pot pas obrir lo fiquier -Name[pa]=ਫਾਇਲ਼ ਖੋਲà©à¨¹à©€ ਨਹੀਂ ਜਾ ਸਕਦੀ -Name[pl]=Nie można otworzyć pliku -Name[pt]=Não Consigo Abrir o Ficheiro -Name[pt_BR]=Não Foi PossÃvel Abrir o Arquivo -Name[ro]=Nu pot deschide fiÅŸierul -Name[ru]=Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ файл -Name[rw]=Ntibishobotse Gufungura Idosiye -Name[se]=Ii sáhte rahpat filla -Name[sk]=Nemôžem otvoriÅ¥ súbor -Name[sl]=Ni moÄ odpreti datoteke -Name[sq]=Nuk mund ta hap skedën -Name[sr]=Ðије могуће отворити фајл -Name[sr@Latn]=Nije moguće otvoriti fajl -Name[ss]=Akukhonakali kuvula lifayela -Name[sv]=Kan inte öppna fil -Name[ta]=கோபà¯à®ªà¯ˆà®¤à¯ திறகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ -Name[te]=దసà±à°¤à±à°°à°¾à°¨à±à°¨à°¿ తెరà±à°µà°²à±‡à°¨à± -Name[tg]=Ðаметавон файлро кушод -Name[th]=ไม่สามารถเปิดà¹à¸Ÿà¹‰à¸¡à¹„ด้ -Name[tr]=Dosya Açılamıyor -Name[tt]=Biremne Aça AlmÃm -Name[uk]=Ðеможливо відкрити файл -Name[uz]=Faylni ochib boÊ»lmadi -Name[uz@cyrillic]=Файлни очиб бўлмади -Name[ven]=I ngasi vule faela -Name[vi]=Không thể mở táºp tin -Name[wa]=Dji n' sai drovi l' fitchî -Name[xh]=Ayinakuyivula Ifayile -Name[zh_CN]=æ— æ³•æ‰“å¼€æ–‡ä»¶ -Name[zh_HK]=無法打開檔案 -Name[zh_TW]=無法打開檔案 -Name[zu]=Ifayela Alivulekile Comment=The selected file cannot be opened for reading or writing -Comment[af]=Die gekose lêer kan nie oop wees vir lees of om te skryf -Comment[ar]=المل٠المختار لا يمكن ÙتØÙ‡ للقراءة أو الكتابة -Comment[az]=Seçili fayl oxunmaq ya da yazılmaq üçün açıla bilmir -Comment[be]=Ðемагчыма прачытаць/запіÑаць выбраны файл -Comment[bg]=ИзбраниÑÑ‚ файл не може да бъде отворен за четене или Ð·Ð°Ð¿Ð¸Ñ -Comment[bn]=নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলটি পড়া বা লেখার জনà§à¦¯ খোলা যাচà§à¦›à§‡ না -Comment[br]=N'heller ket digeriñ ar restr diuzet evit lenn pe skrivañ -Comment[bs]=Ne mogu otvoriti izabranu datoteku za Äitanje ili pisanje -Comment[ca]=El fitxer seleccionat no es pot obrir per a lectura o escriptura -Comment[cs]=Vybraný soubor nenà možné otevÅ™Ãt pro Ätenà nebo zápis. -Comment[csb]=Wëbróny lopk nie mòże òstac òtemkÅ‚i do czëtaniô czë zapisaniô -Comment[cy]=Methu agor y ffeil penodol i'w ddarllen neu i'w ysgrifennu. -Comment[da]=Den valgte fil kan ikke Ã¥bnes til læsning eller skrivning -Comment[de]=Die gewählte Datei kann nicht zum Lesen oder Schreiben geöffnet werden. -Comment[el]=Το επιλεγμÎνο αÏχείο δεν μποÏεί να ανοιχθεί για εγγÏαφή ή ανάγνωση -Comment[eo]=La elektita dosiero ne estas malfermebla por legado aÅ skribado -Comment[es]=El archivo seleccionado no se puede abrir para leer o escribir. -Comment[et]=Valitud faili pole võimalik avada lugemiseks või kirjutamiseks. -Comment[eu]=Hautatutako fitxategia ezin da irakurtzeko edo idazteko ireki -Comment[fa]=پروندۀ برگزیده نمی‌تواند برای خواندن یا نوشتن باز شود -Comment[fi]=Valittua tiedostoa ei voida avata luettavaksi tai kirjoitettavaksi -Comment[fr]=Le fichier sélectionné ne peut être ouvert ni en lecture ni en écriture -Comment[fy]=It selektearre triem kin net iepene wurde om te lêzen of skriuwen -Comment[ga]=Nà féidir an comhad roghnaithe a oscailt chun é a léamh nó chun scrÃobh air -Comment[gl]=O ficheiro escollido non se pode abrir para ler ou escreber -Comment[he]=×ין ×פשרות לפתוח ×ת הקובץ ×”× ×‘×—×¨ לקרי××” ×ו כתיבה -Comment[hi]=चà¥à¤¨à¤¾ हà¥à¤† फ़ाइल पढ़ने अथवा लिखने के लिठखोला नहीं जा सकता। -Comment[hr]=Odabranu datoteku nije moguće otvoriti za Äitanje ili zapisivanje -Comment[hsb]=Wubrana dataja njehodźi so woÄinić -Comment[hu]=A kiválasztott fájlt nem lehet megnyitni Ãrásra vagy olvasásra -Comment[id]=Berkas yang dipilih tidak dapat dibuka untuk dibaca atau ditulis -Comment[is]=Ekki er hægt að opna völdu skrána til lestrar eða skriftar -Comment[it]=Il file selezionato non può essere aperto per la lettura o la scrittura -Comment[ja]=é¸æŠžã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’èªã¿è¾¼ã¿ã¾ãŸã¯æ›¸ãè¾¼ã¿ã®ãŸã‚ã«é–‹ã‘ã¾ã›ã‚“ -Comment[ka]=მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ˜áƒ¡ გáƒáƒ®áƒ¡áƒœáƒ წáƒáƒ¡áƒáƒ™áƒ˜áƒ—ხáƒáƒ“ áƒáƒœ ჩáƒáƒ¡áƒáƒ¬áƒ”რáƒáƒ“ ვერხერხდებრ-Comment[kk]=Таңдалған файл жазуға не оқуға ашылмады -Comment[km]=មិន​អាច​បើក​អាន​ពី ឬ សរសáŸážšâ€‹áž‘ៅ​ឯកសារ​ដែល​បាន​ជ្រើស -Comment[ko]=ê³ ë¥¸ 파ì¼ì„ ì½ê±°ë‚˜ 쓰기위해 ì—´ 수가 없습니다 -Comment[lb]=Déi ausgewielten Datei kann net opgemat gi fir ze liesen oder ze schreiwen -Comment[lt]=Nurodytos bylos negalima atverti skaitymui arba raÅ¡ymui -Comment[lv]=IzvÄ“lÄ“tais fails nevar tikt atvÄ“rts lasÄ«Å¡anai vai rakstÄ«Å¡anai -Comment[mk]=Избраните датотеки не можат да Ñе отворат за читање или пишување -Comment[mn]=СонгоÑон файл уншигдах ÑÑвÑл бичигдÑÑ…ÑÑÑ€ нÑÑгдÑхгүй байна. -Comment[ms]=Fail dipilih tidak boleh dibaca atau ditulis -Comment[mt]=Il-fajl magħżul ma setax jinfetaħ għall-qari jew kitba. -Comment[nb]=Den valgte fila kan ikke Ã¥pnes for lesing eller skriving -Comment[nds]=De utsöchte Datei lett sik nich lesen oder schrieven -Comment[ne]=पढà¥à¤¨ वा लेखà¥à¤¨à¤•à¤¾ लागि चयन गरिà¤à¤•à¤¾ फाइल खोलà¥à¤¨ सकेन -Comment[nl]=Het geselecteerde bestand kan niet worden geopend om te lezen of naar te schrijven. -Comment[nn]=Den valte fila kan ikkje opnast for lesing eller skriving -Comment[nso]=Faele yeo e kgethilwego ekase bulelwe go bala goba go ngwala -Comment[oc]=Lo fiquièr seleccionat pod pas esser obrit per legir on escriure -Comment[pa]=ਚà©à¨£à©€ ਫਾਇਲ ਨੂੰ ਪੜਨ ਜਾਂ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ -Comment[pl]=Wybrany plik nie może być otwarty do odczytu lub zapisu -Comment[pt]=O ficheiro seleccionado não pode ser aberto para leitura ou escrita. -Comment[pt_BR]=O arquivo selecionado não pode ser aberto para leitura ou gravação -Comment[ro]=FiÅŸierul selectat nu poate fi deschis pentru scriere sau citire -Comment[ru]=Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ выбранный файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи или Ñ‡Ñ‚ÐµÐ½Ð¸Ñ -Comment[rw]=Idosiye yatoranyijwe ntishoboye gufungurwa mu gusoma cyangwa kwandika -Comment[se]=Válljejuvvon fiilla ii sáhte rahpat lohkama dahje Äállima várás -Comment[sk]=Vybraný súbor nemôžem otvoriÅ¥ na ÄÃtanie alebo zápis -Comment[sl]=Izbrane datoteke ni bilo moÄ odpreti za branje ali pisanje. -Comment[sq]=Skedari i zgjedhur nuk mund të hapet për lexim apo editim -Comment[sr]=Изабрани фајл је немогуће отворити ради читања или пиÑања -Comment[sr@Latn]=Izabrani fajl je nemoguće otvoriti radi Äitanja ili pisanja -Comment[ss]=lifayela lelikhetsiwe akukhonakali kutsi livulwe kutsi lifundvwe kumbe libhalwe -Comment[sv]=Den valda filen kan inte öppnas för läsning eller skrivning -Comment[ta]=தேரà¯à®µà¯ செயà¯à®¤ கோபà¯à®ªà¯ˆ வாசிகà¯à®•à®µà¯‹ எழà¯à®¤à®µà¯‹ திறகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯ -Comment[te]=ఎఓపిక చేసిన దసà±à°¤à±à°°à°¾à°¨à±à°¨à°¿ à°šà°¦à±à°µà±à°Ÿà°•à± లేక à°µà±à°°à°¾à°¯à±à°Ÿà°•à± తెరà±à°µà°²à±‡à°¨à± -Comment[tg]=Ðаметавон файли интихобшударо барои Ñабт Ñ‘ хондан кушод -Comment[th]=ไม่สามารถเปิดà¹à¸Ÿà¹‰à¸¡à¸—ี่เลืà¸à¸à¹„ว้ เพื่à¸à¸—ำà¸à¸²à¸£à¸à¹ˆà¸²à¸™à¸«à¸£à¸·à¸à¹€à¸‚ียนได้ -Comment[tr]=Seçili dosya okumnmak ya da yazılmak için açılamıyor -Comment[tt]=SaylanÄŸan biremne, uqu yä ki yazu eÅŸe öçen açıp bulmà -Comment[uk]=Вибраний файл не може бути відкритий Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ запиÑу -Comment[uz]=Tanlangan faylni na oÊ»qish na yozish uchun ochib boÊ»ladi. -Comment[uz@cyrillic]=Танланган файлни на ўқиш на ёзиш учун очиб бўлади. -Comment[ven]=Faela yo nangwaho ingasi vulwe u vhala kana u nwala -Comment[vi]=Táºp tin được chá»n không có khả năng mở để Ä‘á»c hay ghi. -Comment[xh]=Ifayile ekhethiweyo ayinakuvulelwa ukufunda okanye ukubhala -Comment[zh_CN]=选ä¸çš„文件ä¸èƒ½æ‰“å¼€æ¥è¯»æˆ–写 -Comment[zh_HK]=所é¸å–的檔案無法開啟進行讀å–或者是寫入 -Comment[zh_TW]=所é¸å–的檔案無法開啟進行讀å–或者是寫入 -Comment[zu]=Ifayela elikhethiwe alingeke livulwe ukuze lifundwe ukufundwa noma ukubhalwa default_presentation=0 [fatalerror] Name=Fatal Error -Name[af]=Fatale Fout -Name[ar]=خطأ قاتل -Name[az]=Ölümcül XÉ™ta -Name[bg]=Фатална грешка -Name[bn]=মারাতà§à¦®à¦• সমসà§à¦¯à¦¾ -Name[br]=Fazi sac'hus -Name[bs]=Fatalna greÅ¡ka -Name[ca]=Error fatal -Name[cs]=Závažná chyba -Name[csb]=Kriticznô fela -Name[cy]=Gwall Angheuol -Name[da]=Fatal fejl -Name[de]=Schwerer Fehler -Name[el]=ΜοιÏαίο σφάλμα -Name[eo]=Grava Eraro -Name[es]=Error fatal -Name[et]=Fataalne viga -Name[eu]=Errore larria -Name[fa]=خطای مهلک -Name[fi]=Peruuttamaton virhe -Name[fr]=Problème critique -Name[fy]=Fatale flater -Name[ga]=Earráid Mharfach -Name[gl]=Erro moi grave -Name[he]=שגי××” חמורה -Name[hi]=गंà¤à¥€à¤° तà¥à¤°à¥à¤Ÿà¤¿ -Name[hr]=Ozbiljna pogreÅ¡ka -Name[hsb]=Fatalny zmylk -Name[hu]=Végzetes hiba -Name[id]=Kesalahan Fatal -Name[is]=Banvæn villa -Name[it]=Errore fatale -Name[ja]=致命的ãªã‚¨ãƒ©ãƒ¼ -Name[ka]=ფáƒáƒ¢áƒáƒšáƒ£áƒ ი შეცდáƒáƒ›áƒ -Name[kk]=Түзелмейтін қате -Name[km]=កំហុស​ធ្ងន់ធ្ងរ -Name[ko]=치명ì ì¸ ì˜¤ë¥˜ -Name[lb]=Fatale Feeler -Name[lt]=Lemtinga klaida -Name[lv]=FatÄla Kļūda -Name[mk]=Фатална грешка -Name[mn]=Үхлүүт(Fatal) алдаа -Name[ms]=Ralat Maut -Name[mt]=Problema Fatali -Name[nb]=Fatal feil -Name[nds]=Groot Malöör -Name[ne]=घातक तà¥à¤°à¥à¤Ÿà¤¿ -Name[nl]=Fatale fout -Name[nn]=Fatal feil -Name[nso]=Bothatathata -Name[oc]=Error fatala -Name[pa]=ਘਾਤਕ ਗਲਤੀ -Name[pl]=BÅ‚Ä…d krytyczny -Name[pt]=Erro Fatal -Name[pt_BR]=Erro fatal -Name[ro]=Eroare fatală -Name[ru]=Ð¤Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° -Name[rw]=Ikosa rikomeye -Name[se]=VáralaÅ¡ meattáhus -Name[sk]=Fatálna chyba -Name[sl]=Usodna napaka -Name[sq]=Gabim fatal -Name[sr]=Кобна грешка -Name[sr@Latn]=Kobna greÅ¡ka -Name[ss]=Liphutsa lelibi -Name[sv]=Allvarligt fel -Name[ta]=மீளமà¯à®Ÿà®¿à®¯à®¾à®¤à¯ தவற௠-Name[te]=హానికరమైన దోషం -Name[tg]=Хатои ногузир -Name[th]=เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดร้ายà¹à¸£à¸‡ -Name[tr]=Ölümcül Hata -Name[tt]=Ãœtmäslek Xata -Name[uk]=Фатальна помилка -Name[uz]=Juda jiddiy xato -Name[uz@cyrillic]=Жуда жиддий хато -Name[ven]=Vhukhakhi vhuhulwane -Name[vi]=Lá»—i nghiêm trá»ng -Name[wa]=Aroke moirt -Name[xh]=Imposiso Enengozi -Name[zh_CN]=致命错误 -Name[zh_HK]=åš´é‡éŒ¯èª¤ -Name[zh_TW]=åš´é‡éŒ¯èª¤ -Name[zu]=Iphutha Lengozi Comment=There was a serious error causing the program to exit -Comment[af]=Daar was 'n ernstige fout wat veroorsaak het dat die program beïendig is. -Comment[be]=ÐдбылаÑÑ Ñур'Ñ‘Ð·Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°, ÑÐºÐ°Ñ Ð¿Ñ€Ñ‹Ð²Ñла да выхаду з праграмы -Comment[bg]=ПоÑви Ñе Ñериозна грешка, коÑто предизвика Ñпиране на програмата -Comment[bn]=à¦à¦•à¦Ÿà¦¿ গà§à¦°à§à¦¤à¦° তà§à¦°à§à¦Ÿà¦¿à¦° দরà§à¦£ পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à¦Ÿà¦¿ থেমে গেছে -Comment[br]=Ur fazi grevus a voe pennabeg mont er-maez ar goulev. -Comment[bs]=Program je morao zavrÅ¡iti zbog ozbiljne greÅ¡ke -Comment[ca]=Hi ha hagut un error seriós que ha fet que el programa acabi -Comment[cs]=Nastala závažná chyba, která způsobila ukonÄenà programu -Comment[csb]=Pòkôza sã pòwôżnô fela, jakô doprowadzëła do zamkniãcô programë -Comment[da]=Der var et alvorligt problem som fik programmet til at afslutte -Comment[de]=Es ist ein schwerer Fehler aufgetreten und das Programm wurde beendet. -Comment[el]=ΣυνÎβη Îνα σοβαÏÏŒ σφάλμα που Îκανε το Ï€ÏόγÏαμμα να τεÏματίσει -Comment[eo]=Okazis grava eraro, kiu ĉesigis la programon. -Comment[es]=Hubo un error serio que ha causado el cierre del programa -Comment[et]=Ilmnes tõsine viga, mis sundis programmi tööd lõpetama -Comment[eu]=Errore larria gertatu da eta programa itxiarazi du. -Comment[fa]=یک خطای جدی باعث خروج برنامه شد -Comment[fi]=Tapahtui vakava virhe, jonka takia ohjelma lopetettiin -Comment[fr]=Un problème grave a provoqué l'arrêt du programme -Comment[fy]=Der wie in serieuse flater wertroch it programma sluten is -Comment[ga]=Tharla droch-earráid, agus tá an clár tar éis stopadh -Comment[gl]=Houbo un erro sério que provocou o remate da execución do programa -Comment[he]=×ירעה שגי××” חמורה שגרמה ×œ×ª×•×›× ×™×ª לצ×ת -Comment[hi]=à¤à¤• अति गंà¤à¥€à¤° तà¥à¤°à¥à¤Ÿà¤¿ हà¥à¤ˆ जिसके कारण पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® बाहर हो गया -Comment[hr]=Program je morao zavrÅ¡iti s radom zbog ozbiljne pogreÅ¡ke -Comment[hsb]=Je so chutny zmylk staÅ‚, kiž je program skónÄiÅ‚ -Comment[hu]=Súlyos hiba történt, ezért a program futása félbeszakadt. -Comment[id]=Ada kesalahan serius yang menyebabkan progam diakhiri -Comment[is]=Alvarleg villa stöðvaði keyrslu forritsins. -Comment[it]=Si è verificato un errore grave che ha causato la fine del programma -Comment[ja]=プãƒã‚°ãƒ©ãƒ ãŒçµ‚了ã™ã‚‹æ·±åˆ»ãªã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã—㟠-Comment[ka]=სერიáƒáƒ–ული შეცდáƒáƒ›áƒ, რáƒáƒ›áƒ”ლმáƒáƒª პრáƒáƒ’რáƒáƒ›áƒ˜áƒ“áƒáƒœ გáƒáƒ¡áƒ•áƒšáƒ გáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ˜áƒ. -Comment[kk]=Бір маңызды қате бағдарламадан шығуға мәжбүрледі -Comment[km]=មាន​កំហុស​ធ្ងន់ធ្ងរ​មួយ​ដែល​បាន​បណ្ážáž¶áž›â€‹áž²áŸ’យ​កម្មវិធី​បិទ -Comment[lb]=Et gouf e schwéiere Feeler, an de Programm gouf zougemat -Comment[lt]=Ä®vyko rimta klaida, privertusi programÄ… užbaigti darbÄ… -Comment[lv]=GadÄ«jusies nopietna kļuda, kas izraisa izieÅ¡anu no programmas -Comment[mk]=Се Ñлучи Ñериозна грешка поради која програмот заврши -Comment[ms]=Ada ralat serius menyebabkan program tutup. -Comment[nb]=Det var en alvorlig feil som førte til at programmet avsluttet -Comment[nds]=Dor is en Malöör passeert, dat Programm warrt afbraken -Comment[ne]=कारà¥à¤¯à¤•à¥à¤°à¤®à¤¬à¤¾à¤Ÿ निसà¥à¤•à¤¨à¤¾à¤²à¥‡ तà¥à¤¯à¤¹à¤¾à¤ गमà¥à¤à¤¿à¤° तà¥à¤°à¥à¤Ÿà¤¿ à¤à¤¯à¥‹ -Comment[nl]=Er was een ernstige fout die ervoor zorgde dat dit programma beëindigd werd -Comment[nn]=Ein alvorleg feil førte til at programmet avslutta -Comment[pa]= ਇੱਕ ਘਾਤਕ ਗਲਤੀ ਨੇ ਕਾਰਜ ਨੂੰ ਬੰਦ ਹੋਣ ਲਈ ਮਜਬੂਰ ਕਰ ਦਿੱਤਾ ਹੈ -Comment[pl]=WystÄ…piÅ‚ poważny bÅ‚Ä…d, który spowodowaÅ‚ zamkniÄ™cie programu -Comment[pt]=Ocorreu um erro grave que provocou o fim da execução do programa -Comment[pt_BR]=Houve um erro sério, que fez o programa finalizar -Comment[ro]=A apărut o eroare severă care a determinat terminarea programului -Comment[ru]=Серьёзный Ñбой, приведший к выходу из программы. -Comment[rw]=Habaye ikosa rikomeye ritera porogaramu guhagarara -Comment[se]=Vearrás meattáhusa geažil prográmma heittii -Comment[sk]=Vyskytla sa vážna chyba, ktorá spôsobila ukonÄenie programu -Comment[sl]=Program se je konÄal zaradi resne napake -Comment[sr]=ДеÑила Ñе озбиљна грешка, која је изазвала да Ñе програм затвори -Comment[sr@Latn]=Desila se ozbiljna greÅ¡ka, koja je izazvala da se program zatvori -Comment[sv]=Ett allvarligt fel uppstod vilket fick programmet att avslutas -Comment[ta]=நிரலை வெளியேறச௠செயà¯à®•à®¿à®± அளவில௠ஒர௠பெரிய தவறà¯à®£à¯à®Ÿà¯. -Comment[te]=à°®à±à°–à±à°¯à°®à±ˆà°¨ దోషం à°’à°•à°Ÿà°¿ కారà±à°¯à°•à±à°°à°®à°‚ నిషà±à°•à±à°°à°®à°£à°•à± కారణమైనది -Comment[tg]=ÐуқÑони ҷиддие, ки ба баромадан аз барнома раÑонид -Comment[th]=เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดร้ายà¹à¸£à¸‡ ทำให้ต้à¸à¸‡à¸à¸à¸à¸ˆà¸²à¸à¹‚ปรà¹à¸à¸£à¸¡ -Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluÅŸtu -Comment[tt]=Yazılımnan çığuına kitergän citdi xata kilep çıqqan -Comment[uk]=Серйозна помилка Ñтала причиною виходу програми -Comment[uz]=Dasturning ishini yakunlanishiga sababchi boÊ»lgan jiddiy xato roÊ»y berdi -Comment[uz@cyrillic]=ДаÑтурнинг ишини Ñкунланишига Ñабабчи бўлган жиддий хато рўй берди -Comment[vi]=Gặp lá»—i nghiêm trong mà gây ra chÆ°Æ¡ng trình thoát. -Comment[zh_CN]=有一个严é‡çš„错误导致程åºé€€å‡º -Comment[zh_HK]=發生了嚴é‡çš„錯誤，導致程å¼çµæŸ -Comment[zh_TW]=發生了一個嚴é‡çš„錯誤導致çµæŸè©²ç¨‹å¼ã€‚ default_presentation=2 level=4 [notification] Name=Notification -Name[af]=Inkennisstelling -Name[ar]=تنبيه -Name[az]=XÉ™bÉ™rdarlıq -Name[be]=Ðагадванне -Name[bg]=Съобщение -Name[bn]=সংবাদ -Name[br]=Kemennadenn -Name[bs]=ObavjeÅ¡tenje -Name[ca]=Notificació -Name[cs]=Oznámenà -Name[csb]=Ã’dkôzanié -Name[cy]=Hybys -Name[da]=Bekendtgørelse -Name[de]=Benachrichtigung -Name[el]=Ειδοποίηση -Name[eo]=Atentigo -Name[es]=Notificación -Name[et]=Märguanne -Name[eu]=Jakinarazpena -Name[fa]=اخطار -Name[fi]=Huomautus -Name[fo]=Ãminning -Name[fy]=Notifikaasje -Name[ga]=Fógairt -Name[gl]=Notificación -Name[he]=הודעה -Name[hi]=सूचना -Name[hr]=Obavijest -Name[hsb]=Zdźělenka -Name[hu]=Rendszerfigyelmeztetések -Name[id]=Pemberitahuan -Name[is]=Tilkynning -Name[it]=Avviso -Name[ja]=通知 -Name[ka]=შეტყáƒáƒ‘ინებრ-Name[kk]=Құлақтандыру -Name[km]=ការ​ជូន​ដំណឹង -Name[ko]=알림 -Name[lb]=Noricht -Name[lt]=PraneÅ¡imai -Name[lv]=ApziņoÅ¡ana -Name[mk]=ИзвеÑтување -Name[mn]=Сонордуулга -Name[ms]=Pemberitahuan -Name[mt]=Notifika -Name[nb]=Varsling -Name[nds]=Bescheed -Name[ne]=सूचना -Name[nl]=Notificatie -Name[nn]=PÃ¥minning -Name[nso]=Tsebiso -Name[oc]=Notificacion -Name[pa]=ਟਿੱਪਣੀ -Name[pl]=Powiadomienie -Name[pt]=Mensagem -Name[pt_BR]=Notificação -Name[ro]=Notificare -Name[ru]=Сообщение -Name[rw]=Imenyesha -Name[se]=Dieđáhus -Name[sk]=Upozornenie -Name[sl]=Obvestilo -Name[sq]=Lajmërim -Name[sr]=Обавештење -Name[sr@Latn]=ObaveÅ¡tenje -Name[ss]=Satiso -Name[sv]=Underrättelse -Name[ta]=அறிவிபà¯à®ªà¯ -Name[te]=à°ªà±à°°à°•à°Ÿà°¨ -Name[tg]=Иттилоот -Name[th]=à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™ -Name[tr]=Uyarı -Name[tt]=Beldermä -Name[uk]=ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ -Name[uz]=Xabarnoma -Name[uz@cyrillic]=Хабарнома -Name[ven]=Ndivhadzo -Name[vi]=Thông báo -Name[wa]=Notifiaedje -Name[xh]=Isaziso -Name[zh_CN]=通知 -Name[zh_HK]=通知 -Name[zh_TW]=通知 -Name[zu]=Isaziso Comment=Something special happened in the program -Comment[af]=Iets spesiaal het met die program gebeur -Comment[bg]=Ð’ програмата Ñе Ñлучи нещо неочаквано -Comment[bn]=পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à§‡ বিশেষ কিছৠà¦à¦•à¦Ÿà¦¾ ঘটেছে -Comment[br]=Un dra bennak dibar a c'hoarvezas gant ar goulev -Comment[bs]=NeÅ¡to posebno se desilo u programu -Comment[ca]=Ha passat quelcom d'especial al programa -Comment[cs]=NÄ›co zvláštnÃho se stalo s programem -Comment[csb]=W programie staÅ‚o sã cos òsoblëwégò -Comment[da]=Der skete noget specielt i programmet -Comment[de]=Es ist eine besondere Programmsituation aufgetreten. -Comment[el]=Κάτι εξαιÏετικό συνÎβη στο Ï€ÏόγÏαμμα -Comment[eo]=Io nekutima okazis en la programo -Comment[es]=Ocurrió algo especial en el programa -Comment[et]=Programmis juhtus midagi erilist -Comment[eu]=Gertaera berezia gertatu da programan -Comment[fa]=اتÙاق خاصی در برنامه رخ داد -Comment[fi]=Ohjelmassa tapahtui jotain erikoista -Comment[fr]=Quelque chose de spécial s'est passé dans le programme -Comment[fy]=Der barde wat spesjaals yn't programma -Comment[ga]=Tharla rud éigean ar leith sa chlár -Comment[gl]=Ocorreu algo especial no programa -Comment[he]=משהו מיוחד קרה ×¢× ×”×ª×•×›× ×™×ª -Comment[hi]=पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® मे कà¥à¤› महतà¥à¤µà¤ªà¥‚रà¥à¤£ घटित हà¥à¤† -Comment[hr]=NeÅ¡to se posebno dogodilo u programu -Comment[hsb]=Něšto njewoÄakowane je so staÅ‚o -Comment[hu]=Valami különleges történt a programban -Comment[id]=Sesuatu yang khusus terjadi dalam program -Comment[is]=Eitthvað sérstakt gerðist à forritinu -Comment[it]=È successo qualcosa di speciale nel programma -Comment[ja]=何ã‹ç‰¹åˆ¥ãªã“ã¨ãŒãƒ—ãƒã‚°ãƒ©ãƒ ã«èµ·ã“ã‚Šã¾ã—㟠-Comment[ka]=პრáƒáƒ’რáƒáƒ›áƒáƒ¨áƒ˜ რáƒáƒ¦áƒáƒª გáƒáƒœáƒ¡áƒáƒ™áƒ£áƒ—რებული მáƒáƒ®áƒ“რ-Comment[kk]=Бағдарламада ерекше бірдеме болды -Comment[km]=មាន​អ្វី​ពិសáŸážŸâ€‹áž˜áž½áž™â€‹áž”ាន​កើážâ€‹áž¡áž¾áž„​ក្នុង​កម្មវិធី -Comment[lb]=Et ass eng speziell Programmsituatioun opgetrueden -Comment[lt]=Kažkoks specialus įvykis programoje -Comment[lv]=ProgrammÄ noticis kas speciÄls -Comment[mk]=Ðешто Ñпецијално Ñе Ñлучило во програмот -Comment[ms]=Sesuatu yang pelik berlaku di dalam program -Comment[nb]=Noe spesielt skjedde med programmet -Comment[nds]=In dat Programm is wat besünners passeert -Comment[ne]=कारà¥à¤¯à¤•à¥à¤°à¤®à¤®à¤¾ केही विशेष आइपरà¥à¤¯à¥‹ -Comment[nl]=Er gebeurde iets bijzonders in het programma -Comment[nn]=Noko spesielt skjedde i programmet -Comment[pa]=ਇਸ ਕਾਰਜ ਵਿੱਚ ਕà©à¨ ਖਾਸ ਹੋ ਗਿਆ ਹੈ -Comment[pl]=CoÅ› specjalnego staÅ‚o sie w programie -Comment[pt]=Ocorreu algo de especial no programa -Comment[pt_BR]=Algo especial ocorreu no programa -Comment[ro]=S-a întîmplat ceva neaÅŸteptat în program -Comment[ru]=Ð’ программе возникла Ð½ÐµÐ¿Ñ€ÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ ÑÐ¸Ñ‚ÑƒÐ°Ñ†Ð¸Ñ -Comment[rw]=Ikintu kidasanzwe cyabaye muri porogaramu -Comment[se]=Juoga erenoamáš dáhpáhuvai prográmmas -Comment[sk]=V programe sa udialo nieÄo neoÄakávané -Comment[sl]=V programu se je zgodilo nekaj izrednega -Comment[sr]=Ðешто поÑебно Ñе деÑило у програму -Comment[sr@Latn]=NeÅ¡to posebno se desilo u programu -Comment[sv]=NÃ¥gonting speciellt inträffade i programmet -Comment[ta]=நிரலில௠à®à®¤à¯‹ விசேடம௠நிகழà¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯ -Comment[te]=కారà±à°¯à°•à±à°°à°®à°‚ లొ à°’à°• విశేషం చొటà±à°šà±†à°¸à±à°•à±à°‚ది -Comment[tg]=Дар барнома ҳолати ногаҳонӣ рӯй дод -Comment[th]=เà¸à¸´à¸”บางà¸à¸¢à¹ˆà¸²à¸‡à¸—ี่พิเศษขึ้นในโปรà¹à¸à¸£à¸¡ -Comment[tr]=Programda özel bir durum meydana geldi -Comment[tt]=Yazılımda kötelmägän närsä kilep çıqqan -Comment[uk]=ЩоÑÑŒ оÑобливе ÑталоÑÑŒ у програмі -Comment[uz]=Dasturda qandaydir odatdan tashqari hodisa roÊ»y berdi -Comment[uz@cyrillic]=ДаÑтурда қандайдир одатдан ташқари ҳодиÑа рўй берди -Comment[vi]=Có gì đặc biệt đã xảy ra trong chÆ°Æ¡ng trình. -Comment[zh_CN]=程åºä¸å‘生了特殊情况 -Comment[zh_HK]=程å¼ç™¼ç”Ÿäº†ç‰¹æ®Šæƒ…æ³ -Comment[zh_TW]=程å¼ä¸ç™¼ç”Ÿäº†ç‰¹æ®Šçš„æƒ…æ³ default_presentation=1 default_sound=KDE_Beep.ogg level=1 [warning] Name=Warning -Name[af]=Waarskuwing -Name[ar]=تØذير -Name[az]=DiqqÉ™t -Name[be]=ПапÑÑ€Ñджанне -Name[bg]=Предупреждение -Name[bn]=সতরà§à¦•à§€à¦•à¦°à¦£ -Name[br]=Kemenn -Name[bs]=Upozorenje -Name[ca]=AvÃs -Name[cs]=Varovánà -Name[csb]=Ã’strzega -Name[cy]=Rhybudd -Name[da]=Advarsel -Name[de]=Warnung -Name[el]=Î Ïοειδοποίηση -Name[eo]=Averto -Name[es]=Aviso -Name[et]=Hoiatus -Name[eu]=Abisua -Name[fa]=اخطار -Name[fi]=Varoitus -Name[fo]=Ãvaring -Name[fr]=Avertissement -Name[fy]=Warskôging -Name[ga]=Rabhadh -Name[gl]=Aviso -Name[he]=×זהרה -Name[hi]=चेतावनी -Name[hr]=Upozorenje -Name[hsb]=Warnowanje -Name[hu]=Figyelmeztetés -Name[id]=Perhatian -Name[is]=Aðvörun -Name[it]=Avvertimento -Name[ja]=è¦å‘Š -Name[ka]=გáƒáƒ¤áƒ თხილებრ-Name[kk]=ЕÑкерту -Name[km]=ព្រមាន -Name[ko]=ê²½ê³ -Name[lb]=Warnung -Name[lt]=DÄ—mesio -Name[lv]=BrÄ«dinÄjums -Name[mk]=Предупредување -Name[mn]=Сануулга -Name[ms]=Amaran -Name[mt]=Twissija -Name[nb]=Advarsel -Name[nds]=Wohrschoen -Name[ne]=चेतावनी -Name[nl]=Waarschuwing -Name[nn]=Ã…tvaring -Name[nso]=Temoso -Name[oc]=Avis -Name[pa]=ਚੇਤਾਵਨੀ -Name[pl]=Ostrzeżenie -Name[pt]=Aviso -Name[pt_BR]=Aviso -Name[ro]=Avertizare -Name[ru]=Предупреждение -Name[rw]=Iburira -Name[se]=Váruhus -Name[sk]=Varovanie -Name[sl]=Opozorilo -Name[sq]=Vërejtje -Name[sr]=Упозорење -Name[sr@Latn]=Upozorenje -Name[ss]=Secwayiso -Name[sv]=Varning -Name[ta]=எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ -Name[te]=హెచà±à°šà°°à°¿à°• -Name[tg]=Огоҳӣ -Name[th]=คำเตืà¸à¸™ -Name[tr]=Dikkat -Name[tt]=Kisätmä -Name[uk]=ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ -Name[uz]=Diqqat -Name[uz@cyrillic]=Диққат -Name[ven]=Khaidzo -Name[vi]=Cảnh báo -Name[wa]=Adviertixhmint -Name[xh]=Isilumkiso -Name[zh_CN]=è¦å‘Š -Name[zh_HK]=è¦å‘Š -Name[zh_TW]=è¦å‘Š -Name[zu]=Isexwayiso Comment=There was an error in the program which may cause problems -Comment[af]=Daar was 'n fout in die program wat dalk probleme kan veroorsaak -Comment[be]=У праграме адбылаÑÑ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°, ÑÐºÐ°Ñ Ð¼Ð¾Ð¶Ð° Ñтварыць перашкоды нармальнай працы -Comment[bg]=ПоÑви Ñе грешка, коÑто може да предизвика проблеми -Comment[bn]=পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à§‡ à¦à¦•à¦Ÿà¦¿ তà§à¦°à§à¦Ÿà¦¿ ছিল যার ফলে সমসà§à¦¯à¦¾ হতে পারে -Comment[br]=Ur fazi a voe er goulev a c'hellfe bezañ pennabeg kudennoù. -Comment[bs]=Postoji greÅ¡ka u programu koja možda uzrokuje probleme. -Comment[ca]=Hi ha hagut un error en el programa que podria causar problemes -Comment[cs]=Nastala chyba v programu, která může způsobit problémy -Comment[csb]=Pòkôza sã fela, jakô mòże doprowadzëc do zmiÅ‚ków w dalszi robòce -Comment[da]=Der opstod en alvorlig fejl som kan forÃ¥rsage problemer -Comment[de]=Es ist ein Programmfehler aufgetreten, der Probleme verursachen könnte. -Comment[el]=ΥπήÏξε Îνα σφάλμα στο Ï€ÏόγÏαμμα που ίσως να Ï€ÏοκαλÎσει Ï€Ïοβλήματα -Comment[eo]=Okazis eraro en la programo, kiu povus kaÅzi problemojn. -Comment[es]=Hubo un error en el programa que puede causar problemas -Comment[et]=Programmis ilmnes viga, mis võib tekitada probleeme -Comment[eu]=Arazoak sor ditzakeen errorea gertatu da programan -Comment[fa]=خطایی در برنامه وجود دارد Ú©Ù‡ ممکن است باعث بروز مسائلی شود -Comment[fi]=Ohjelmassa tapahtui virhe, joka voi aiheuttaa ongelmia -Comment[fr]=Une erreur est survenu dans le programme, pouvant causer des dysfonctionnements. -Comment[fy]=Der wie in flater yn it programma wat swierrichheid feroorsaakje kin -Comment[ga]=Bhà earráid sa chlár agus b'fhéidir go mbeidh fadhbanna dá barr -Comment[gl]=Houbo un erro no programa que pode causar problemas. -Comment[he]=×ירעה שגי××” חמורה שעלולה ×œ×’×¨×•× ×œ×‘×¢×™×•×ª -Comment[hi]=पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® में तà¥à¤°à¥à¤Ÿà¤¿ है जिससे समसà¥à¤¯à¤¾ उतà¥à¤ªà¤¨à¥à¤¨ हो सकती है -Comment[hr]=UoÄena je pogreÅ¡ka u programu zbog koje bi moglo biti problema -Comment[hsb]=Je so nÄ›kajki zmylk staÅ‚, kiž móhÅ‚ problemy sÄinić -Comment[hu]=Olyan hiba történt a programban, mely további problémákat okozhat -Comment[id]=Ada kesalahan dalam program yang dapat menyebabkan masalah -Comment[is]=Það kom upp villa à forritinu sem gæti valdið vandræðum -Comment[it]=Nel programma si è verificato un errore che può causare problemi -Comment[ja]=å•é¡Œã‚’引ãèµ·ã“ã™å¯èƒ½æ€§ã®ã‚るエラーãŒãƒ—ãƒã‚°ãƒ©ãƒ ã«ã‚ã‚Šã¾ã—㟠-Comment[ka]=პრáƒáƒ’რáƒáƒ›áƒ˜áƒ¡ შეცდáƒáƒ›áƒ, რáƒáƒ›áƒ”ლმáƒáƒª შესáƒáƒ«áƒšáƒáƒ პრáƒáƒ‘ლემრშექმნáƒáƒ¡ -Comment[kk]=Бір қате бағдарламада мәÑелелер тудырды -Comment[km]=មាន​កំហុស​មួយ​ក្នុង​កម្មវិធី​ដែល​អាច​បណ្ážáž¶áž›â€‹áž²áŸ’យ​មាន​បញ្ហា -Comment[lb]=Et ass e Feeler am Programm opgetrueden, dee Problemer verursaache kéint -Comment[lt]=Ä®vyko programos klaida, galinti sukelti problemų -Comment[lv]=ProgrammÄ bija kļūda, kas var radÄ«t problÄ“mas -Comment[mk]=Се Ñлучи грешка во програмот што може да предизвика проблеми -Comment[ms]=Ada ralat di dalam program yang menyebabkan masalah. -Comment[nb]=Det var en feil i programmet som kan føre til problemer -Comment[nds]=Dat geev en Fehler in dat Programm, villicht treckt he Problemen na sik -Comment[ne]=समसà¥à¤¯à¤¾ आउनà¥à¤®à¤¾ कारà¥à¤¯à¤•à¥à¤°à¤®à¤®à¤¾ तà¥à¤°à¥à¤Ÿà¤¿ कारण थियो -Comment[nl]=Er zat een fout in het programma die voor problemen kon zorgen -Comment[nn]=Det oppstod ein feil i programmet og kan føra til problem -Comment[pa]=ਕਾਰਜ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ, ਜੋ ਕਿ ਸਮੱਸਿਆ ਪੈਦਾ ਕਰ ਰਹੀ ਹੈ -Comment[pl]=WystÄ…piÅ‚ bÅ‚Ä…d, który może spowodować zakłócenia w pracy -Comment[pt]=Ocorreu um erro grave no programa que pode causar problemas -Comment[pt_BR]=Houve um erro no programa que pode ter causado problemas -Comment[ro]=A apărut o eroare în program care ar putea cauza probleme -Comment[ru]=Ошибка в программе, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ вызвать проблемы -Comment[rw]=Habaye ikosa muri porogaramu rishobora gutera ibibazo -Comment[se]=Prográmmas lei meattáhus mii sáhttá dagahit váttisvuoÄ‘aid -Comment[sk]=V programe sa vyskytla chyba, ktorá môže spôsobiÅ¥ problémy -Comment[sl]=V programu je nastala napaka, ki lahko povzroÄi težave -Comment[sr]=ДеÑила Ñе грешка у програму која може изазвати проблеме -Comment[sr@Latn]=Desila se greÅ¡ka u programu koja može izazvati probleme -Comment[sv]=Det uppstod ett fel i programmet vilket kan orsaka problem -Comment[ta]=பிரசà¯à®©à¯ˆà®•à®³à¯ˆ à®à®±à¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®®à¯ அளவிறà¯à®•à¯ நிரலில௠ஒர௠தவற௠இரà¯à®¨à¯à®¤à®¤à¯. -Comment[te]=కారà±à°¯à°•à±à°°à°®à°‚ లొ దోషం కలదà±, ఇది సమసà±à°¯à°²à°¨à± à°•à°²à±à°—చేయవచà±à°šà±à°¨à± -Comment[tg]=Хатои барнома, ки метавон ба маÑъалаҳое оварад -Comment[th]=มีข้à¸à¸œà¸´à¸”พลาดในโปรà¹à¸à¸£à¸¡ ซึ่งà¸à¸²à¸ˆà¸ˆà¸°à¸ªà¹ˆà¸‡à¸œà¸¥à¹ƒà¸«à¹‰à¹€à¸à¸´à¸”ปัà¸à¸«à¸²à¹„ด้ -Comment[tr]=Programda ciddi bir hata oluÅŸtu -Comment[tt]=QıyınlıqlarÄŸa kiterä ala torÄŸan xatalar kilep çıqqannar -Comment[uk]=СталаÑÑ Ñерйозна помилка, Ñка може викликати проблеми -Comment[uz]=Dasturda muammolarga olib kelishi mumkin boÊ»lgan xato roÊ»y berdi -Comment[uz@cyrillic]=ДаÑтурда муаммоларга олиб келиши мумкин бўлган хато рўй берди -Comment[vi]=Gặp lá»—i trong chÆ°Æ¡ng trình, mà có thể gây ra vấn Ä‘á». -Comment[zh_CN]=程åºä¸å‘生了å¯èƒ½å¯¼è‡´é—®é¢˜çš„错误 -Comment[zh_TW]=程å¼ä¸ç™¼ç”Ÿäº†ä¸€å€‹å¯èƒ½æœƒå°Žè‡´ç™¼ç”Ÿå•é¡Œçš„錯誤。 default_presentation=2 level=2 [catastrophe] Name=Catastrophe -Name[af]=Katastrofe -Name[ar]=كارثة -Name[az]=FaciÉ™ -Name[be]=КатаÑтрофа -Name[bg]=КатаÑтрофа -Name[bn]=বিপরà§à¦¯à§Ÿ -Name[br]=Gwalldaol -Name[bs]=Katastrofa -Name[ca]=Catà strofe -Name[cs]=Katastrofa -Name[csb]=Katastrofa -Name[cy]=Erchyll -Name[da]=Katastrofe -Name[de]=Schwerwiegender Fehler -Name[el]=ΚαταστÏοφή -Name[eo]=Katastrofo -Name[es]=Catástrofe -Name[et]=Katastroof -Name[eu]=Ondamendia -Name[fa]=Ùاجعه -Name[fi]=Katastrofi -Name[fy]=Katastrofe -Name[ga]=Tubaiste -Name[gl]=Catástrofe -Name[he]=קטסטרופה -Name[hi]=पà¥à¤°à¤²à¤¯ -Name[hr]=Katastrofa -Name[hsb]=Katastrofa -Name[hu]=Katasztrófa -Name[id]=Katastrofi -Name[is]=Stórslys -Name[it]=Catastrofe -Name[ja]=大惨事 -Name[ka]=სისტემის კრáƒáƒ®áƒ˜ -Name[kk]=Ð–Ð°Ò£Ñ‹Ð»Ñ‹Ñ -Name[km]=មហន្ážážšáž¶áž™ -Name[ko]=í°ì¼ë‚¬ìŠµë‹ˆë‹¤ -Name[lb]=Katastroph -Name[lt]=Katastrofa -Name[lv]=Katastrofa -Name[mk]=КатаÑтрофа -Name[mn]=СүйрÑл -Name[ms]=Malapetaka -Name[mt]=Katastrofu -Name[nb]=Katastrofe -Name[nds]=Katastroof -Name[ne]=विपतà¥à¤¤à¥€ -Name[nl]=Catastrofe -Name[nn]=Katastrofe -Name[oc]=Catastrofe -Name[pa]=ਕਾਟਾਸਟਰੋਫੀ -Name[pl]=Katastrofa -Name[pt]=Catástrofe -Name[pt_BR]=Catástrofe -Name[ro]=Catastrofă -Name[ru]=Сбой ÑиÑтемы -Name[rw]=Amakuba -Name[se]=Katastrofa -Name[sk]=Katastrofa -Name[sl]=Katastrofa -Name[sq]=Katastrofë -Name[sr]=КатаÑтрофа -Name[sr@Latn]=Katastrofa -Name[ss]=Inhlekelele -Name[sv]=Katastrof -Name[ta]=பிரளயம௠-Name[te]=విపతà±à°¤à± -Name[tg]=ÐуқÑони ÑиÑтема -Name[th]=เหตุหายนะ -Name[tr]=Facia -Name[tt]=Bälä-qaza -Name[uk]=КатаÑтрофа -Name[uz]=Fojia -Name[uz@cyrillic]=Фожиа -Name[ven]=Mutshinyalo -Name[vi]=Lá»—i rất nghiêm trá»ng -Name[xh]=Ingozi enkulu -Name[zh_CN]=严é‡é—®é¢˜ -Name[zh_HK]=åš´é‡å•é¡Œ -Name[zh_TW]=åš´é‡å•é¡Œ -Name[zu]=Inhlekelele Comment=A very serious error occurred, at least causing the program to exit -Comment[af]='n baie ernstige fout het voorgekom. Dit het veroorsaak dat ten minste die program beëindig is -Comment[ar]=Øدث خطأ كبير سيؤدي على الأقل الى ايقا٠البرنامج -Comment[az]=Çox ciddi bir xÉ™ta yarandÉ™ vÉ™ proqramı çıxmaÄŸa mÉ™cbur etdi -Comment[be]=ÐдбылаÑÑ Ð²ÐµÐ»ÑŒÐ¼Ñ– Ñур'Ñ‘Ð·Ð½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°, ÑÐºÐ°Ñ Ð¿Ñ€Ñ‹Ð²Ñла да выхаду з праграмы -Comment[bg]=ПоÑви Ñе Ñериозна грешка, коÑто предизвика Ñпиране на програмата -Comment[bn]=à¦à¦•à¦Ÿà¦¿ গমà§à¦à§€à¦° তà§à¦°à§à¦Ÿà¦¿à¦° ফলে পà§à¦°à§‹à¦—à§à¦°à¦¾à¦®à¦Ÿà¦¿ থেমে গেছে -Comment[br]=Ur fazi grevus-tre a c'hoarvezas, a lakas d'an nebeutañ ar goulev da vont er-maez -Comment[bs]=DoÅ¡lo je do vrlo ozbiljne greÅ¡ke koja je uzrokovala najmanje prekid programa -Comment[ca]=Hi ha hagut un error molt seriós, com a mÃnim ha causat la finalització del programa -Comment[cs]=Nastala velmi závažná chyba, která pÅ™inejmenÅ¡Ãm způsobila ukonÄenà programu. -Comment[csb]=Pòkôza sã pòwôżnô fela, jakô doprowadzëła co nômni do zakùńczeniô programë -Comment[cy]=Digwyddodd gwall difrifol iawn, oedd o leiaf yn achosi i'r rhaglen derfynu -Comment[da]=Der opstod et meget alvorligt problem som fik programmet til at afslutte. -Comment[de]=Ein schwerer Fehler ist aufgetreten, der zumindest zum Beenden des Programms geführt hat. -Comment[el]=Ένα Ï€Î¿Î»Ï ÏƒÎ¿Î²Î±ÏÏŒ σφάλμα συνÎβη, που τουλάχιστον οδήγησε στο κλείσιμο του Ï€ÏογÏάμματος -Comment[eo]=Okazis tre grava eraro, kiu ĉesigis la programon -Comment[es]=Ocurrió un error muy serio, causando al menos el cierre del programa. -Comment[et]=Ilmnes väga tõsine viga, mis sundis programmi tööd lõpetama. -Comment[eu]=Errore oso larria gertatu da, programa itxiaraziz -Comment[fa]=یک خطای بسیار جدی رخ داد، Øداقل باعث خروج برنامه شد -Comment[fi]=Tapahtui vakava virhe, jonka takia ohjelma ainakin lopetetaan. -Comment[fr]=Une erreur très grave s'est produite, provoquant au moins l'arrêt du programme -Comment[fy]=In serieuse flater had him foardyn wertroch it programma sluten is -Comment[ga]=Tharla droch-earráid, agus ara laghad tá an clár tar éis stopadh -Comment[gl]=Ocorreu un erro moi sério, causando polo menos o remate da execución do programa -Comment[he]=×ירעה שגי××” חמורה מ×וד, שלפחות גרמה ×œ×ª×•×›× ×™×ª לצ×ת -Comment[hi]=à¤à¤• अति गंà¤à¥€à¤° तà¥à¤°à¥à¤Ÿà¤¿ हà¥à¤ˆ, जिससे पà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® बाहर हो गया -Comment[hr]=DoÅ¡lo je do jako ozbiljne pogreÅ¡ke, koja će u najmanju ruku prouzrokovati zatvaranje programa. -Comment[hsb]=Je so jara chutny zmylk staÅ‚, kiž je znajmjeÅ„Å¡a program skónÄiÅ‚ -Comment[hu]=Súlyos programhiba történt, a program futása félbeszakadt -Comment[id]=Ada kesalahan serius muncul, menyebabkan program harus diakhiri -Comment[is]=Mjög alvarleg villa kom upp, sem hefur stöðvað keyrslu forritsins -Comment[it]=Si è verificato un errore molto grave, che come minimo ha causato la fine del programma -Comment[ja]=éžå¸¸ã«é‡å¤§ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã€ãã®ãŸã‚ã«å°‘ãªãã¨ã‚‚プãƒã‚°ãƒ©ãƒ ãŒçµ‚了ã—ã¾ã—㟠-Comment[ka]=სერიáƒáƒ–ული შეცდáƒáƒ›áƒ, რáƒáƒ›áƒ”ლმáƒáƒª პრáƒáƒ’რáƒáƒ›áƒ˜áƒ“áƒáƒœ გáƒáƒ¡áƒ•áƒšáƒ გáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ˜áƒ -Comment[kk]=Өте маңызды бір қате кемінде бағдарламадан шығуға мәжбүрледі -Comment[km]=កំហុស​ដáŸâ€‹áž’្ងន់ធ្ងរ​បំផុážâ€‹áž˜áž½áž™â€‹áž”ាន​កើážáž¡áž¾áž„ ដែល​យ៉ាង​ហោច​ណាស់ ​វា​បណ្ážáž¶áž›â€‹áž²áŸ’យកម្មវិធី​បិទ -Comment[ko]=í”„ë¡œê·¸ëž¨ì´ ëë‚ ë•Œ 아주 심ê°í•œ 오류가 ìƒê²¼ìŠµë‹ˆë‹¤ -Comment[lb]=E ganz schlëmme Feeler ass opgetrueden, deen op Mannst zum Ophale vum Programm gefouert huet -Comment[lt]=Ä®vyko labai rimta klaida, privertusi programÄ… bent jau baigti darbÄ…. -Comment[lv]=GadÄ«jusies ļoti nopietna kļūda, kas kÄ minumums izraisa izieÅ¡anu no programmas -Comment[mk]=Се Ñлучи Ñериозна грешка, што во најмала рака предизвика програмот да Ñе иÑклучи -Comment[mn]=Дор хаÑж программыг таÑлан гарах ноцтой алдаа гарлаа. -Comment[ms]=Ada ralat sangat serius di dalam program yang menyebabkan program keluar -Comment[nb]=Det oppsto en alvorlig feil som til slutt førte til at programmet avsluttet -Comment[nds]=Dor is en Malöör passeert, dat tominnst to't Enn vun't Programm föhrt hett -Comment[ne]=कमà¥à¤¤à¤¿à¤®à¤¾ कारà¥à¤¯à¤•à¥à¤°à¤® अनà¥à¤¤à¥à¤¯ गरà¥à¤¦à¤¾, à¤à¤‰à¤Ÿà¤¾ धेरै गमà¥à¤à¤¿à¤° तà¥à¤°à¥à¤Ÿà¤¿ देखा परà¥à¤¯à¥‹ -Comment[nl]=Er deed zich een zeer ernstige fout voor, waardoor tenminste de toepassing werd afgesloten -Comment[nn]=Ein svært alvorleg feil oppstod, som førte til at programmet avslutta -Comment[pa]=ਇੱਕ ਘਾਤਕ ਗਲਤੀ ਆਈ ਹੈ, ਘੱਟੋ-ਘੱਟ ਇਹ ਕਾਰਜ ਨੂੰ ਬੰਦ ਹੋਣ ਲਈ ਮਜ਼ਬੂਰ ਕਰ ਰਹੀ ਹੈ -Comment[pl]=WystÄ…piÅ‚ bardzo poważny bÅ‚Ä…d, który spowodowaÅ‚ przynajmniej zakoÅ„czenie programu -Comment[pt]=Ocorreu um erro muito grave, que no mÃnimo provocou o fim da execução do programa -Comment[pt_BR]=Ocorreu um erro grave, que causou no mÃnimo a saÃda do programa. -Comment[ro]=A apărut o eroare foarte severă în program care a provocat cel puÅ£in terminarea lui -Comment[ru]=Возник Ñерьёзный Ñбой, приведший как минимум к выходу из программы -Comment[rw]=Ikosa rikomeye cyane ryagaragaye, rituma porogaramu ihagarara -Comment[se]=Hui vearrás meattáhus dáhpáhuvai, dagahii goit prográmma heaitit -Comment[sk]=Vyskytla sa veľmi vážna chyba, ktorá minimálne ukonÄà program -Comment[sl]=Nastala je tako resna napaka, da se bo konÄal program. -Comment[sq]=Një gabim serioz ka ndodhur, së paku do të shkaktoj mbylljen e programit -Comment[sr]=ДеÑила Ñе веома озбиљна грешка, која ће у најмању руку проузроковати затварање програма -Comment[sr@Latn]=Desila se veoma ozbiljna greÅ¡ka, koja će u najmanju ruku prouzrokovati zatvaranje programa -Comment[sv]=Ett väldigt allvarligt fel uppstod som Ã¥tminstone fick programmet att avslutas -Comment[ta]=நிரலை வெளியேறச௠செயà¯à®¯à¯à®®à¯ அளவில௠ஒர௠பெரிய தவற௠à®à®±à¯à®ªà®Ÿà¯à®Ÿà®¤à¯ -Comment[te]=చాలా à°®à±à°–à±à°¯à°®à±ˆà°¨ దోషం à°’à°•à°Ÿà°¿ కారà±à°¯à°•à±à°°à°®à°‚లో వచà±à°šà°¿à°‚ది,ఇది కనీసం కారà±à°¯à°•à±à°°à°®à°‚ నిషà±à°•à±à°°à°®à°£à°•à± కారణమౌతà±à°‚ది -Comment[tg]=ÐуқÑони ҷиддӣ рӯй дод, ки чун минимум ба аз барнома баромадан раÑонид -Comment[th]=เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดที่ร้ายà¹à¸£à¸‡à¸¡à¸²à¸ ซึ่งà¸à¸¢à¹ˆà¸²à¸‡à¸™à¹‰à¸à¸¢à¸ˆà¸°à¸—ำให้โปรà¹à¸à¸£à¸¡à¸ˆà¸šà¸à¸²à¸£à¸—ำงาน -Comment[tr]=Programın kapanmasına neden olan ciddi bir hata oluÅŸtu ve programdan çıkıldı. -Comment[tt]=İñ kimendä,yazılımnan çığuına kitergän bik citdi xata kilep çıqqan -Comment[uk]=СталаÑÑ Ð´ÑƒÐ¶Ðµ Ñерйозна помилка, Ñка, щонайменше, Ñтала причиною виходу програми -Comment[uz]=Dasturning ishini yakunlanishiga sababchi boÊ»lgan jiddiy xato roÊ»y berdi -Comment[uz@cyrillic]=ДаÑтурнинг ишини Ñкунланишига Ñабабчи бўлган жиддий хато рўй берди -Comment[vi]=Gặp lá»—i rất nghiêm trá»ng mà Ãt nhất đã gây ra chÆ°Æ¡ng trình thoát. -Comment[zh_CN]=出现了一个éžå¸¸ä¸¥é‡çš„错误，至少使程åºé€€å‡º -Comment[zh_HK]=發生了一個很嚴é‡çš„錯誤，令程å¼å¿…é ˆçµæŸ -Comment[zh_TW]=å› ç‚ºç™¼ç”Ÿäº†ä¸€å€‹å¾ˆåš´é‡çš„錯誤，所以該程å¼å¿…é ˆè¦çµæŸ default_presentation=2 level=8 [starttde] Name=Login -Name[af]=Aanteken -Name[ar]=دخول -Name[az]=GiriÅŸ -Name[be]=Уваход -Name[bg]=Вход в ÑиÑтемата -Name[bn]=লগ-ইন -Name[br]=Anv ereañ -Name[bs]=Prijava -Name[ca]=Accés -Name[cs]=PÅ™ihlášenà -Name[csb]=Logòwanié -Name[cy]=Mewngofnodi -Name[da]=Log pÃ¥ -Name[de]=Anmelden -Name[el]=ΣÏνδεση -Name[eo]=Ensaluto -Name[es]=Entrada -Name[et]=Sisselogimine -Name[eu]=Hasi saioa -Name[fa]=ورود -Name[fi]=Kirjaudu sisään -Name[fo]=Innrita -Name[fr]=Début de session -Name[fy]=Oanmelde -Name[ga]=Logáil Isteach -Name[he]=×›× ×™×¡×” למערכת -Name[hi]=लॉगइन -Name[hr]=Prijava -Name[hsb]=PÅ™izjewjenje -Name[hu]=Bejelentkezés -Name[is]=Innstimplun -Name[it]=Accesso -Name[ja]=ãƒã‚°ã‚¤ãƒ³ -Name[ka]=შესვლრ-Name[kk]=Кіру -Name[km]=ចូល -Name[ko]=ë¡œê·¸ì¸ -Name[ku]=Têketin -Name[lb]=Umellen -Name[lt]=Registracija -Name[lv]=Pieteikties -Name[mk]=Ðајавување -Name[mn]=БүртгүүлÑÑ… -Name[ms]=Log masuk -Name[nb]=Logg inn -Name[nds]=Anmellen -Name[ne]=लगइन -Name[nl]=Aanmelden -Name[nn]=Logg inn -Name[nso]=Tsena -Name[oc]=Conneccion -Name[pa]=ਲਾਗਇਨ -Name[pl]=Zalogowanie -Name[pt]=Inicio de sessão -Name[ro]=Logare -Name[ru]=Вход -Name[rw]=Ifashayinjira -Name[se]=SisaÄáliheapmi -Name[sk]=Prihlásenie -Name[sl]=Prijava -Name[sq]=Hyni -Name[sr]=Пријава -Name[sr@Latn]=Prijava -Name[ss]=Kungena -Name[sv]=Logga in -Name[ta]=நà¯à®´à¯ˆà®µà¯ -Name[te]=లాగినౠ-Name[tg]=Вурудот -Name[th]=ล็à¸à¸à¸à¸´à¸™ -Name[tr]=GiriÅŸ -Name[tt]=KereÅŸ -Name[uk]=РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ -Name[uz]=Kirish -Name[uz@cyrillic]=Кириш -Name[ven]=U dzhena kha khomupwutha -Name[vi]=Äăng nháºp -Name[wa]=Elodjaedje -Name[xh]=Igama elithile -Name[zh_CN]=登录 -Name[zh_HK]=登入 -Name[zh_TW]=登入 -Name[zu]=Ukungena ngaphakathi Comment=TDE is starting up -Comment[af]=Begin TDE Laai -Comment[ar]=جاري بدء تشغيل TDE -Comment[be]=Стартаванне TDE -Comment[bg]=Стартиране на ÑиÑтемата -Comment[bn]=কে.ডি.ই. চালৠহচà§à¦›à§‡ -Comment[br]=Emañ o loc'hañ TDE -Comment[bs]=TDE se pokreće -Comment[ca]=S'està engegant el TDE -Comment[cs]=SpouÅ¡tà se prostÅ™edà TDE -Comment[csb]=Zrëszënié TDE -Comment[da]=TDE er ved at starte -Comment[de]=TDE startet -Comment[el]=Το TDE ξεκινά -Comment[eo]=TDE estas lanĉata -Comment[es]=TDE está arrancando -Comment[et]=TDE käivitub -Comment[eu]=TDE abiarazten ari da -Comment[fa]=TDE در Øال راه‌اندازی است -Comment[fi]=TDE:tä käynnistetään -Comment[fr]=TDE est en cours de démarrage -Comment[fy]=TDE set útein -Comment[ga]=Tá TDE ag tosú. -Comment[gl]=TDE está a Iniciar-se -Comment[he]=×יתחול TDE בעיצומו -Comment[hi]=केडीई पà¥à¤°à¤¾à¤°à¤‚ठहो रहा है -Comment[hr]=Podizanje TDE -Comment[hsb]=TDE so startuje -Comment[hu]=A TDE elindul -Comment[id]=TDE mulai dijalankan -Comment[is]=TDE er að ræsa -Comment[it]=Avvio di TDE -Comment[ja]=TDE èµ·å‹•ä¸ -Comment[ka]=TDE-ს დáƒáƒ¬áƒ§áƒ”ბრ-Comment[kk]=TDE жұмыÑын баÑтауда -Comment[km]=TDE កំពុង​ចាប់ផ្ážáž¾áž˜ -Comment[ku]=TDE dest pê dike -Comment[lb]=TDE gëtt gestart -Comment[lt]=TDE pradeda darbÄ… -Comment[lv]=Tiek startÄ“ts TDE -Comment[mk]=TDE Ñе вклучува -Comment[ms]=TDE sedang bermula -Comment[nb]=TDE starter -Comment[nds]=TDE warrt start -Comment[ne]=TDE सà¥à¤°à¥à¤†à¤¤ हà¥à¤¦à¥ˆà¤› -Comment[nl]=TDE is aan het opstarten -Comment[nn]=TDE startar -Comment[pa]=TDE ਸ਼à©à¨°à©‚ ਹੋ ਰਿਹਾ ਹੈ -Comment[pl]=Uruchomienie TDE -Comment[pt]=O TDE está a arrancar -Comment[pt_BR]=TDE está iniciando -Comment[ro]=TDE porneÅŸte -Comment[ru]=ЗапуÑк TDE -Comment[rw]=TDE iri gutangira -Comment[se]=TDE vuolgigoahtá johtui -Comment[sk]=TDE sa spúšťa -Comment[sl]=TDE se zaganja -Comment[sr]=TDE Ñе покреће -Comment[sr@Latn]=TDE se pokreće -Comment[sv]=TDE startas -Comment[ta]=கேடிஇ ஆரமà¯à®ªà®¿à®•à¯à®•à®¿à®±à®¤à¯ -Comment[te]=కెడిఈ మొదవà±à°¤à±à°‚ది -Comment[tg]=Оғози TDE -Comment[th]=TDE à¸à¸³à¸¥à¸±à¸‡à¹€à¸£à¸´à¹ˆà¸¡à¸à¸²à¸£à¸—ำงาน -Comment[tr]=TDE masaüstü baÅŸlıyor -Comment[tt]=TDE yöklänä -Comment[uk]=Триває запуÑк TDE -Comment[uz]=TDE ishga tushmoqda -Comment[uz@cyrillic]=TDE ишга тушмоқда -Comment[vi]=TDE Ä‘ang khởi chạy. -Comment[zh_CN]=TDE æ£åœ¨å¯åŠ¨ -Comment[zh_HK]=TDE æ£åœ¨å•Ÿå‹• -Comment[zh_TW]=TDE æ£åœ¨å•Ÿå‹• default_presentation=1 default_sound=KDE_Startup_1.ogg [exittde] Name=Logout -Name[af]=Teken af -Name[ar]=الخروج -Name[az]=Çıxış -Name[be]=ЗаканчÑнне ÑеанÑу -Name[bg]=Изход от ÑиÑтемата -Name[bn]=লগ-আউট -Name[br]=Kuitaat -Name[bs]=Odjava -Name[ca]=Sortida -Name[cs]=Odhlášenà -Name[csb]=Wëlogòwanié -Name[cy]=Allgofnodi -Name[da]=Log af -Name[de]=Abmelden -Name[el]=ΑποσÏνδεση -Name[eo]=Elsaluto -Name[es]=Salida -Name[et]=Väljalogimine -Name[eu]=Amaitu saioa -Name[fa]=خروج -Name[fi]=Kirjaudu ulos -Name[fo]=Útrita -Name[fr]=Fin de session -Name[fy]=Ofmelde -Name[ga]=Logáil Amach -Name[he]=יצי××” מהמערכת -Name[hi]=लॉगआउट -Name[hr]=Odjava -Name[hsb]=Wotzjewjenje -Name[hu]=Kijelentkezés -Name[is]=Stimpla út -Name[it]=Uscita -Name[ja]=ãƒã‚°ã‚¢ã‚¦ãƒˆ -Name[ka]=გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ -Name[kk]=Шығу -Name[km]=áž…áŸáž‰ -Name[ko]=로그아웃 -Name[ku]=Derketin -Name[lb]=Ofmellen -Name[lt]=IÅ¡siregistravimas -Name[lv]=Atteikties -Name[mk]=Одјавување -Name[mn]=Хаалгах -Name[ms]=Log keluar -Name[mt]=Temm is-sessjoni -Name[nb]=Logg ut -Name[nds]=Afmellen -Name[ne]=लगआउट -Name[nl]=Afmelden -Name[nn]=Logg ut -Name[nso]=Etswa -Name[oc]=Desconneccion -Name[pa]=ਲਾਗਆਉਟ -Name[pl]=Wylogowanie -Name[pt]=Fim de sessão -Name[pt_BR]=Sair -Name[ro]=IeÅŸire -Name[ru]=Выход из TDE -Name[rw]=Gusohoka -Name[se]=OlggosÄáliheapmi -Name[sk]=Odhlásenie -Name[sl]=Odjava -Name[sq]=Dilni -Name[sr]=Одјављивање -Name[sr@Latn]=Odjavljivanje -Name[ss]=Phuma -Name[sv]=Logga ut -Name[ta]=à®®à¯à®Ÿà®¿à®¤à¯à®¤à®²à¯ -Name[te]=లాగౌటౠ-Name[tg]=Баромад аз TDE -Name[th]=ล็à¸à¸à¹€à¸à¸²à¸•à¹Œ -Name[tr]=Çıkış -Name[tt]=Çığış -Name[uk]=Кінець ÑеанÑу -Name[uz]=Chiqish -Name[uz@cyrillic]=Чиқиш -Name[ven]=U litsha u shumisa khomupwutha -Name[vi]=Äăng xuất -Name[wa]=Dislodjaedje -Name[xh]=Phuma ngaphandle -Name[zh_CN]=注消 -Name[zh_HK]=登出 -Name[zh_TW]=登出 -Name[zu]=Phumela ngaphandle Comment=TDE is exiting -Comment[af]=TDE is besig om toe te maak -Comment[ar]=جاري إيقا٠TDE -Comment[be]=Выхад з TDE -Comment[bg]=Спиране на ÑиÑтемата -Comment[bn]=কে.ডি.ই. বনà§à¦§ করা হচà§à¦›à§‡ -Comment[br]=Emañ o kuitaat TDE -Comment[bs]=TDE se zatvara -Comment[ca]=S'està aturant el TDE -Comment[cs]=UkonÄuje se prostÅ™edà TDE -Comment[csb]=Zakùńczenié TDE -Comment[da]=TDE er ved at afslutte -Comment[de]=TDE wird beendet -Comment[el]=Το TDE τεÏματίζει -Comment[eo]=TDE estas finata -Comment[es]=TDE está terminando -Comment[et]=TDE lõpetab töö -Comment[eu]=TDE bukatzen ari da -Comment[fa]=TDE در Øال خروج است -Comment[fi]=TDE:tä sammutetaan -Comment[fr]=TDE est en cours d'arrêt -Comment[fy]=TDE giet nei de útgong -Comment[ga]=Tá TDE ag stopadh. -Comment[gl]=TDE está Saindo -Comment[he]=היצי××” מ־TDE בעיצומה -Comment[hi]=केडीई बंद हो रहा है -Comment[hr]=Izlazak TDE -Comment[hsb]=TDE so zakónÄi -Comment[hu]=A TDE kilép -Comment[id]=TDE sedang diakhiri -Comment[is]=TDE er að hætta -Comment[it]=Uscita da TDE -Comment[ja]=TDE çµ‚äº†ä¸ -Comment[ka]=TDE-დáƒáƒœ გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ -Comment[kk]=TDE жүйеÑінен шығу -Comment[km]=TDE កំពុង​បិទ -Comment[lb]=TDE gëtt zougemat -Comment[lt]=TDE baigia darbÄ… -Comment[lv]=TDE beidz darbu -Comment[mk]=TDE излегува -Comment[ms]=TDE sedang keluar -Comment[nb]=TDE avslutter -Comment[nds]=TDE warrt utmaakt -Comment[ne]=TDE अनà¥à¤¤à¥à¤¯ हà¥à¤à¤¦à¥ˆà¤› -Comment[nl]=TDE is aan het afsluiten -Comment[nn]=TDE avsluttar -Comment[pa]=TDE ਸਮਾਪਤ ਹੋ ਰਿਹਾ ਹੈ -Comment[pl]=ZakoÅ„czenie TDE -Comment[pt]=O TDE está a terminar -Comment[pt_BR]=TDE está finalizando -Comment[ro]=TDE se termină -Comment[ru]=Выход из TDE -Comment[rw]=TDE iri gufunga -Comment[se]=TDE heaitigoÄ‘ii -Comment[sk]=TDE sa ukonÄuje -Comment[sl]=TDE se konÄuje -Comment[sr]=TDE Ñе завршава -Comment[sr@Latn]=TDE se zavrÅ¡ava -Comment[sv]=TDE avslutas -Comment[ta]=கேடிஇ வெளிசà¯à®šà¯†à®²à¯à®•à®¿à®±à®¤à¯ -Comment[te]=కెడిఈ నిషà±à°•à±à°°à°®à°¿à°¸à±à°¤à±à°‚ది -Comment[tg]=Баромад аз TDE -Comment[th]=à¸à¸³à¸¥à¸±à¸‡à¸à¸à¸à¸ˆà¸²à¸ TDE -Comment[tr]=TDE Masaüstünden çıkılıyor -Comment[tt]=TDE tuqtatıla -Comment[uk]=Триває Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ TDE -Comment[uz]=TDE ishini yakunlamoqda -Comment[uz@cyrillic]=TDE ишини Ñкунламоқда -Comment[vi]=TDE Ä‘ang thoát. -Comment[zh_CN]=TDE æ£åœ¨é€€å‡º -Comment[zh_HK]=TDE æ£åœ¨çµæŸ -Comment[zh_TW]=TDE æ£åœ¨çµæŸ default_presentation=1 default_sound=KDE_Logout_3.ogg [cancellogout] Name=Logout canceled -Name[bg]=Излизането от ÑиÑтемата отменено -Name[ca]=S'ha anul·lat la desconnexió -Name[cs]=Odhlášenà zruÅ¡eno -Name[csb]=Wëlogòwanié òprzestóné -Name[da]=Log af annulleret -Name[de]=Abmelden abgebrochen -Name[el]=Η αποσÏνδεση ακυÏώθηκε -Name[eo]=Elsaluto estis rezignita -Name[es]=Salida cancelada -Name[et]=Väljalogimine katkestatud -Name[fi]=Uloskirjautuminen peruttu -Name[fr]=Annulation de la déconnexion -Name[fy]=Ofmelding ôfbrutsen -Name[hr]=Odjavljivanje prekinuto -Name[hu]=Kijelentkezés megszakÃtva -Name[is]=Hætt við útstimplun -Name[it]=Uscita annullata -Name[ja]=ãƒã‚°ã‚¢ã‚¦ãƒˆãŒã‚ャンセルã•ã‚Œã¾ã—㟠-Name[ka]=გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ გáƒáƒ£áƒ¥áƒ›áƒ“რ-Name[kk]=Шығу доғарылды -Name[km]=ការ​ចáŸáž‰â€‹áž”ាន​បោះបង់ -Name[lt]=IÅ¡siregistravimas nutrauktas -Name[mk]=Откажано одјавување -Name[nb]=Avbrutt utlogging -Name[nds]=Afmellen afbraken -Name[nl]=Afmelden geannuleerd -Name[nn]=Utlogging avbroten -Name[pa]=ਲਾਗਆਉਟ ਰੱਦ ਕੀਤਾ ਗਿਆ -Name[pl]=Wylogowanie anulowane -Name[pt]=Encerramento cancelado -Name[pt_BR]=Logout cancelado -Name[ru]=Выход из TDE прерван -Name[sk]=Odhlásenie zruÅ¡ené -Name[sl]=Odjava preklicana -Name[sr]=Одјављивање отказано -Name[sr@Latn]=Odjavljivanje otkazano -Name[sv]=Utloggning avbruten -Name[te]=లాగౌటౠరదà±à°¦à±à°šà±‡à°¯à°¬à°¡à°¿à°¨à°¦à°¿ -Name[tg]=Баромадан аз TDE қатъ шуд -Name[th]=ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸¥à¹‡à¸à¸à¹€à¸à¸²à¸•à¹Œ -Name[tr]=Oturumu kapatma iÅŸlemi iptal edildi -Name[uk]=Вихід ÑкаÑовано -Name[uz]=Chiqish bekor qilindi -Name[uz@cyrillic]=Чиқиш бекор қилинди -Name[zh_CN]=注消已å–消 -Name[zh_TW]=å–消登出 Comment=TDE logout was canceled -Comment[bg]=Излизането от TDE беше отменено -Comment[ca]=S'ha anul·lat la desconnexió del TDE -Comment[cs]=Odhlášenà z TDE bylo zruÅ¡eno -Comment[csb]=Logòwanié TDE òprzestóné -Comment[da]=log af fra TDE blev annulleret -Comment[de]=Das Abmelden von TDE wurde abgebrochen -Comment[el]=Η αποσÏνδεση από το TDE ακυÏώθηκε -Comment[eo]=TDE-elsaluto estas rezignita -Comment[es]=La salida de TDE fue cancelada -Comment[et]=TDE väljalogimine katkestati -Comment[fi]=TDE:n uloskirjautuminen on peruttu -Comment[fr]=La déconnexion de TDE a été annulée -Comment[fy]=TDE ôfmelding wie ôfbrutsen -Comment[hr]=TDE odjavljivanje je prekinuto -Comment[hu]=A TDE-s kijelentkezés megszakadt -Comment[is]=Hætt var við TDE útstimplun -Comment[it]=L'uscita da TDE è stata annullata -Comment[ja]=TDE ã‹ã‚‰ã®ãƒã‚°ã‚¢ã‚¦ãƒˆãŒã‚ャンセルã•ã‚Œã¾ã—㟠-Comment[ka]=TDED გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ გáƒáƒ£áƒ¥áƒ›áƒ“რ-Comment[kk]=TDE-ден шығу доғарылды -Comment[km]=ការ​ចáŸáž‰â€‹ážšáž”ស់ TDE ážáŸ’រូវ​បាន​បោះបង់ -Comment[lt]=IÅ¡siregistravimas iÅ¡ TDE buvo nutrauktas -Comment[mk]=Одјавувањето од TDE е откажано -Comment[nb]=TDE utlogging ble avbrutt -Comment[nds]=Afmellen vun TDE wöör afbraken -Comment[nl]=Uitloggen TDE was geannuleerd -Comment[nn]=TDE-utlogginga vart avbroten -Comment[pa]=TDE ਲਾਗ-ਆਉਟ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ -Comment[pl]=Wylogowanie z TDE zostaÅ‚o anulowane -Comment[pt]=O encerramento da sessão do TDE foi cancelado -Comment[pt_BR]=Logout do TDE foi cancelado -Comment[ru]=Выход из TDE прерван -Comment[sk]=Odhlásenie z TDE bolo zruÅ¡ené -Comment[sl]=Odjava iz TDE je bila preklicana -Comment[sr]=Одјављивање из TDE-а је отказано -Comment[sr@Latn]=Odjavljivanje iz TDE-a je otkazano -Comment[sv]=Utloggning frÃ¥n TDE avbröts -Comment[te]=కెడిఈ లాగౌటౠరదà±à°¦à±à°šà±‡à°¯à°¬à°¡à°¿à°¨à°¦à°¿ -Comment[tg]=Баромадан аз TDE қатъ карда шуд -Comment[th]=à¸à¸²à¸£à¸¥à¹‡à¸à¸à¹€à¸à¸²à¸—์à¸à¸à¸à¸ˆà¸²à¸ TDE ถูà¸à¸¢à¸à¹€à¸¥à¸´à¸ -Comment[tr]=TDE oturumunu kapatma iÅŸlemi iptal edildi -Comment[uk]=Вихід з TDE ÑкаÑовано -Comment[uz]=TDE'dan chiqish bekor qilindi -Comment[uz@cyrillic]=TDE'дан чиқиш бекор қилинди -Comment[zh_CN]=TDE 注销已å–消 -Comment[zh_TW]=TDE 登出動作已被å–消 default_presentation=16 default_sound= [printerror] Name=Print error -Name[af]=Druk fout -Name[ar]=خطأ ÙÙŠ الطباعة -Name[az]=Çap Edici xÉ™tası -Name[be]=Памылка друку -Name[bg]=Грешка при печат -Name[bn]=মà§à¦¦à§à¦°à¦£ তà§à¦°à§à¦Ÿà¦¿ -Name[br]=Fazi en ur moulañ -Name[bs]=GreÅ¡ka pri Å¡tampanju -Name[ca]=Error d'impressió -Name[cs]=Chyba tisku -Name[csb]=Fela drëkù -Name[cy]=Gwall argraffu -Name[da]=Udskriftsfejl -Name[de]=Fehler beim Drucken -Name[el]=Σφάλμα εκτÏπωσης -Name[eo]=Preseraro -Name[es]=Error de impresión -Name[et]=Viga trükkimisel -Name[eu]=Inprimatze-errorea -Name[fa]=خطای چاپ -Name[fi]=Tulostusvirhe -Name[fr]=Problème d'impression -Name[fy]=Printflater -Name[ga]=Earráid phriontála -Name[gl]=Error de impresión -Name[he]=שגי×ת הדפסה -Name[hi]=छपाई तà¥à¤°à¥à¤Ÿà¤¿ -Name[hr]=PogreÅ¡ka ispisa -Name[hsb]=Ćišćenski zmylk -Name[hu]=Nyomtatási hiba -Name[id]=Kesalahan pencetakan -Name[is]=Prentunarvilla -Name[it]=Errore di stampa -Name[ja]=å°åˆ·ã‚¨ãƒ©ãƒ¼ -Name[ka]=ბეáƒáƒ“ვის შეცდáƒáƒ›áƒ -Name[kk]=БаÑып шығару қатеÑÑ– -Name[km]=កំហុស​បោះពុម្ព -Name[ko]=ì¸ì‡„ 오류 -Name[lb]=Dréckfeeler -Name[lt]=Spausdinimo klaida -Name[lv]=Drukas kļūda -Name[mk]=Грешка при печатење -Name[mn]=Ð¥ÑвлÑÑ…Ñд алдаа -Name[ms]= Ralat cetak -Name[mt]=Problema fl-ipprintjar -Name[nb]=Skriverfeil -Name[nds]=Fehler bi't Drucken -Name[ne]=मà¥à¤¦à¥à¤°à¤£ तà¥à¤°à¥à¤Ÿà¤¿ -Name[nl]=Print fout -Name[nn]=Utskriftsfeil -Name[nso]=Bothata bja kgatiso -Name[pa]=ਪà©à¨°à¨¿à©°à¨Ÿà¨° ਗਲਤੀ -Name[pl]=BÅ‚Ä…d wydruku -Name[pt]=Erro de impressão -Name[pt_BR]=Erro de Impressão -Name[ro]=Eroare tipărire -Name[ru]=Ошибка печати -Name[rw]=Ikosa ryo gucapa -Name[se]=Čálihanmeattáhus -Name[sk]=Chyba tlaÄe -Name[sl]=Napaka pri tiskanju -Name[sq]=Gabim shtypi -Name[sr]=Грешка у штампању -Name[sr@Latn]=GreÅ¡ka u Å¡tampanju -Name[ss]=Liphutsa lekushicelela -Name[sv]=Skrivarfel -Name[ta]=அசà¯à®šà¯à®¤à¯ தவற௠-Name[te]=à°ªà±à°°à°šà±à°°à°£ దొషం -Name[tg]=Хатои чоп -Name[th]=à¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œà¸œà¸´à¸”พลาด -Name[tr]=Yazdırma hatası -Name[tt]=Bastıru xatası -Name[uk]=Помилка друку -Name[uz]=Bosib chiqarish xatosi -Name[uz@cyrillic]=БоÑиб чиқариш хатоÑи -Name[ven]=Vhukhakhi hau phirintha -Name[vi]=Lá»—i in -Name[wa]=Aroke d' imprimaedje -Name[xh]=Imposiso yoshicilelo -Name[zh_CN]=打å°é”™è¯¯ -Name[zh_HK]=列å°éŒ¯èª¤ -Name[zh_TW]=列å°éŒ¯èª¤ -Name[zu]=Iphutha lokushicelela Comment=A print error has occurred -Comment[af]='n Druk fout het voorgekom -Comment[ar]=Øدث خطأ ÙÙŠ الطباعة -Comment[az]=Çap xÉ™tası baÅŸ verdi -Comment[be]=ÐдбылаÑÑ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° друку -Comment[bg]=Грешка при печат -Comment[bn]=ছাপানোয় সমসà§à¦¯à¦¾ দেখা দিয়েছে -Comment[br]=Degouezhet ez eus ar fazi gant ar voullerez -Comment[bs]=DoÅ¡lo je do greÅ¡ke pri Å¡tampanju -Comment[ca]=Hi ha hagut un error d'impressió -Comment[cs]=DoÅ¡lo k chybÄ› tisku -Comment[csb]=Wëskrzëniwô sã fela drëkù -Comment[cy]=Mae gwall argraffu wedi digwydd -Comment[da]=Der opstod en udskriftsfejl -Comment[de]=Beim Drucken ist ein Fehler aufgetreten -Comment[el]=Î ÏοÎκυψε Îνα σφάλμα εκτÏπωσης -Comment[eo]=Okazis preseraro -Comment[es]=Se ha producido un error de impresión. -Comment[et]=Viga trükkimisel -Comment[eu]=Inprimatze-errorea gertatu da -Comment[fa]=خطای چاپی رخ داده است -Comment[fi]=Tapahtui tulostusvirhe -Comment[fr]=Un problème d'impression est survenu -Comment[fy]=In printflater had him foardyn -Comment[ga]=Tharla earráid phriontála -Comment[gl]=Ocorreu un erro de impresión -Comment[he]=×ירעה שגי×ת הדפסה -Comment[hi]=छापने में à¤à¤• तà¥à¤°à¥à¤Ÿà¤¿ हà¥à¤ˆ -Comment[hr]=Tijekom ispisivanje doÅ¡lo je do pogreÅ¡ke -Comment[hsb]=Zmylk je so staÅ‚ pÅ™i ćišćenju -Comment[hu]=Hiba történt nyomtatás közben -Comment[id]=Telah terjadi kesalahan pencetakan -Comment[is]=Prentunarvilla átti sér stað -Comment[it]=Si è verificato un errore di stampa -Comment[ja]=å°åˆ·ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠-Comment[ka]=ბეáƒáƒ“ვის შეცდáƒáƒ›áƒ -Comment[kk]=БаÑып шығару кезде қате пайда болды -Comment[km]=កំហុស​បោះពុម្ព​មួយ​បាន​កើážáž¡áž¾áž„ -Comment[ko]=ì¸ì‡„ 오류가 ìƒê²¼ìŠµë‹ˆë‹¤ -Comment[lb]=En Dréckfeeler ass opgetrueden -Comment[lt]=Ä®vyko spausdinimo klaida -Comment[lv]=Notikusi drukas kļūda -Comment[mk]=Се Ñлучи грешка при печатење -Comment[mn]=Ð¥ÑвлÑÑ…Ñд алдаа гарлаа -Comment[ms]=Ralat cetak berlaku -Comment[nb]=En skriverfeil har oppstÃ¥tt -Comment[nds]=Bi't Drucken hett dat en Fehler geven -Comment[ne]=मà¥à¤¦à¥à¤°à¤£ तà¥à¤°à¥à¤Ÿà¤¿ देखापरà¥à¤¯à¥‹ -Comment[nl]=Er deed zich een afdrukfout voor -Comment[nn]=Feil ved utskrift -Comment[pa]=ਇੱਕ ਪà©à¨°à¨¿à©°à¨Ÿà¨° ਗਲਤੀ ਹੈ -Comment[pl]=WystÄ…piÅ‚ bÅ‚Ä…d drukowania -Comment[pt]=Ocorreu um erro de impressão -Comment[pt_BR]=Ocorreu um erro de impressão -Comment[ro]=A apărut o eroare la tipărire -Comment[ru]=Ошибка при печати -Comment[rw]=Ikosa ryo gucapa ryagaragaye -Comment[se]=Čálihanmeattáhus dáhpáhuvai -Comment[sk]=Nastala chyba tlaÄe -Comment[sl]=Nastala je napaka pri tiskanju -Comment[sq]=Ka ndodhur një gabim shtypi -Comment[sr]=Догодила Ñе грешка током штампања -Comment[sr@Latn]=Dogodila se greÅ¡ka tokom Å¡tampanja -Comment[sv]=Utskriftsfel har inträffat -Comment[ta]=அசà¯à®šà¯à®¤à¯ தவறொனà¯à®±à¯ நேரà¯à®¨à¯à®¤à®¿à®°à¯à®•à¯à®•à®¿à®±à®¤à¯ -Comment[te]=à°’à°• à°ªà±à°°à°šà±à°°à°£ దొషం వచà±à°šà°¿à°‚ది -Comment[tg]=Хатои чопкунӣ пайдо шуд -Comment[th]=เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸žà¸´à¸¡à¸žà¹Œ -Comment[tr]=Bir yazdırma hatası oluÅŸtu -Comment[tt]=Bastıru xatası bulıp çıqtı -Comment[uk]=Виникла помилка друку -Comment[uz]=Bosib chiqarish xatosi roÊ»y berdi -Comment[uz@cyrillic]=БоÑиб чиқариш хатоÑи рўй берди -Comment[vi]=Gặp lá»—i in -Comment[wa]=Ã…k n' a nén stî tot-z imprimant -Comment[zh_CN]=å‘生了打å°é”™è¯¯ -Comment[zh_HK]=列å°æ™‚發生錯誤 -Comment[zh_TW]=列å°æ™‚發生錯誤 default_presentation=2 level=8 [messageInformation] Name=Information message -Name[af]=Inligting boodskap -Name[ar]=رسالة المعلومات -Name[az]=MÉ™'lumat ismarışı -Name[be]=Інфармацыйнае паведамленне -Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ -Name[bn]=তথà§à¦¯à¦¬à¦¾à¦°à§à¦¤à¦¾ -Name[br]=Kemennad a titouroù -Name[bs]=Informativna poruka -Name[ca]=Missatge informatiu -Name[cs]=InformaÄnà zpráva -Name[csb]=Wëdowiédny kòmùnikat -Name[cy]=Neges gwybodaeth -Name[da]=Informationsbesked -Name[de]=Information -Name[el]=Μήνυμα πληÏοφοÏίας -Name[eo]=Informa mesaÄo -Name[es]=Mensaje de información -Name[et]=Informatiivne teade -Name[eu]=Informazioaren mezua -Name[fa]=پیام اطلاعاتی -Name[fi]=Tiedoitusviesti -Name[fr]=Message d'information -Name[fy]=Ynformaasje berjocht -Name[ga]=Teachtaireacht Eolais -Name[gl]=Mensaxe de información -Name[he]=הודעת מידע -Name[hi]=सूचनातà¥à¤®à¤• संदेश -Name[hr]=Poruka s podacima -Name[hsb]=Informaciska zdźělenka -Name[hu]=Tájékoztató üzenet -Name[id]=Pesan informasi -Name[is]=Til fróðleiks -Name[it]=Messaggio informativo -Name[ja]=æƒ…å ±ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ -Name[ka]=სáƒáƒ˜áƒœáƒ¤áƒáƒ მáƒáƒªáƒ˜áƒ შეტყáƒáƒ‘ინებრ-Name[kk]=Ðқпараттық хабар -Name[km]=សារ​ដំណឹង -Name[ko]=ì •ë³´ 메세지 -Name[lb]=Informatioun -Name[lt]=Informacinis praneÅ¡imas -Name[lv]=InformatÄ«vs paziņojums -Name[mk]=Информативна порака -Name[mn]=ÐœÑдÑÑллийн мÑдÑÑ -Name[ms]=Mesej maklumat -Name[nb]=Informasjonsmelding -Name[nds]=Informatschoon -Name[ne]=सूचना सनà¥à¤¦à¥‡à¤¶ -Name[nl]=Informatiebericht -Name[nn]=Informasjonsmelding -Name[pa]=ਜਾਣਕਾਰੀ ਸà©à¨¨à©‡à¨¹à©‡ -Name[pl]=Komunikat informacyjny -Name[pt]=Mensagem de informação -Name[pt_BR]=Mensagem de informações -Name[ro]=Mesaj informaÅ£ional -Name[ru]=Информационное Ñообщение -Name[rw]=Ubutumwa bwo kumenyesha -Name[se]=Diehtu -Name[sk]=Informácia -Name[sl]=Informativno sporoÄilo -Name[sq]=Porosi informimi -Name[sr]=Информациона порука -Name[sr@Latn]=Informaciona poruka -Name[sv]=Informationsmeddelande -Name[ta]=தகவல௠செயà¯à®¤à®¿ -Name[te]=సమాచార సందేశం -Name[tg]=Хабари иттилоотӣ -Name[th]=ข้à¸à¸„วามà¹à¸ˆà¹‰à¸‡à¸‚้à¸à¸¡à¸¹à¸¥ -Name[tr]=Bilgi mesajı -Name[tt]=Belderü xäbäre -Name[uk]=Інформаційне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ -Name[uz]=Maʼlumot xabari -Name[uz@cyrillic]=Маълумот хабари -Name[vi]=Thông Ä‘iệp thông tin -Name[wa]=Messaedje d' informÃ¥cion -Name[zh_CN]=ä¿¡æ¯æ€§æ¶ˆæ¯ -Name[zh_HK]=ä¸€èˆ¬è¨Šæ¯ -Name[zh_TW]=è³‡è¨Šè¨Šæ¯ Comment=An information message is being shown -Comment[af]='n Informasie boodskap word vertoon -Comment[ar]=تظهر الآن رسالة معلوماتية -Comment[az]=MÉ™'lumat ismarışı göstÉ™rilir -Comment[be]=Паказана інфармацыйнае паведамленне -Comment[bg]=Показване на уведомително Ñъобщение (ИнформациÑ) -Comment[bn]=à¦à¦•à¦Ÿà¦¿ তথà§à¦¯à¦¬à¦¾à¦°à§à¦¤à¦¾ পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ হচà§à¦›à§‡ -Comment[bs]=Prikazana je informativna poruka -Comment[ca]=Mostrarà un missatge informatiu -Comment[cs]=InformaÄnà zpráva je zobrazena -Comment[csb]=Wëskrzëniwô sã wëdowiédny kòmùnikat -Comment[cy]=Dangosir neges gwybodaeth -Comment[da]=En informationsbesked er ved at blive vist -Comment[de]=Anzeige einer Info-Nachricht -Comment[el]=Ένα μήνυμα πληÏοφοÏίας εμφανίζεται -Comment[eo]=Informa mesaÄo estas montrata -Comment[es]=Se está mostrando un mensaje de información -Comment[et]=Näidatakse informatiivset teadet -Comment[eu]=Informazioren mezua erakusten ari da -Comment[fa]=پیام اطلاعاتی نمایش داده می‌شود -Comment[fi]=Näytetään tiedotusviesti -Comment[fr]=Un message d'information est affiché actuellement -Comment[fy]=In ynformaasje berjocht lit him sjen -Comment[ga]=Tá teachtaireacht eolais á taispeáint -Comment[gl]=Está-se a mostrar unha mensaxe de información -Comment[he]=מוצגת הדעת מידע -Comment[hi]=à¤à¤• जानकारी परक सूचना दिखाई जा रही है -Comment[hr]=Prikazana je poruka s podacima -Comment[hsb]=Informaciska zdźělenka so pokazuje -Comment[hu]=Tájékoztató üzenet látszik -Comment[id]=Pesan informasi sedang ditampilkan -Comment[is]=Skilaboð notandanum til fróðleiks -Comment[it]=Viene mostrato un messaggio informativo -Comment[ja]=æƒ…å ±ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¡¨ç¤ºã—ã¾ã™ -Comment[ka]=სáƒáƒ˜áƒœáƒ¤áƒáƒ მáƒáƒªáƒ˜áƒ შეტყáƒáƒ‘ინების ჩვენებრ-Comment[kk]=Ðқпараттық хабар көрÑетілуде -Comment[km]=កំពុង​បង្ហាញ​សារ​ដំណឹង​មួយ -Comment[ko]=ì •ë³´ 메세지가 보입니다 -Comment[lb]=Eng Informatiounsnoricht gëtt ugewisen -Comment[lt]=Rodomas informacinis praneÅ¡imas -Comment[lv]=Tiek rÄdÄ«ts informatÄ«vs paziņojums -Comment[mk]=Прикажана е информативна порака -Comment[mn]=Харуулж байхад мÑдÑÑллийн мÑдÑÑ -Comment[ms]=Mesej yang dipaparkan -Comment[nb]=En informasjonsmelding blir vist -Comment[nds]=En Informatschoon warrt wiest -Comment[ne]=सूचना सनà¥à¤¦à¥‡à¤¶ देखिरहेको छ -Comment[nl]=Er wordt een informatiebericht getoond -Comment[nn]=Ei informasjonsmelding vert vist -Comment[pa]=ਇੱਕ ਜਾਣਕਾਰੀ ਸà©à¨¨à©‡à¨¹à¨¾ ਹੇਠਾਂ ਵੇਖਿਆ ਗਿਆ ਹੈ -Comment[pl]=Pokazywany jest komunikat informacyjny -Comment[pt]=Está a ser mostrada uma mensagem informativa -Comment[pt_BR]=Uma mensagem de informação está sendo mostrada -Comment[ro]=A fost afiÅŸat un mesaj informaÅ£ional -Comment[ru]=Вывод информационного ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ -Comment[rw]=Ubutumwa bwo kumenyesha bwerekanwe -Comment[se]=Diehtu Äájehuvvo -Comment[sk]=Je zobrazená informácia -Comment[sl]=Prikazano je informativno sporoÄilo -Comment[sq]=Një porosi informimi është paraqitur -Comment[sr]=Приказана је информативна порука -Comment[sr@Latn]=Prikazana je informativna poruka -Comment[sv]=Informationsmeddelande visas -Comment[ta]=ஒர௠தகவல௠செயà¯à®¤à®¿ காணà¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯ -Comment[te]=à°’à°• సమాచార సందేశం చూపించబడà±à°¤à±à°‚ది -Comment[tg]=Хабари иттилоотӣ нишон дода иÑтодааÑÑ‚ -Comment[th]=à¸à¸³à¸¥à¸±à¸‡à¹à¸ªà¸”งข้à¸à¸„วามà¹à¸ˆà¹‰à¸‡à¸‚้à¸à¸¡à¸¹à¸¥ -Comment[tr]=Bir bilgi mesajı gösterildi -Comment[tt]=Belderü xäbäre kürsätelä -Comment[uk]=ПоказуєтьÑÑ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ -Comment[uz]=Maʼlumot xabari koÊ»rsatildi -Comment[uz@cyrillic]=Маълумот хабари кўрÑатилди -Comment[vi]=Má»™t thông Ä‘iệp thông in Ä‘ang được hiển thị. -Comment[wa]=On messaedje d' informÃ¥cion est hÃ¥yné -Comment[zh_CN]=æ£åœ¨æ˜¾ç¤ºä¿¡æ¯æ€§æ¶ˆæ¯ -Comment[zh_HK]=é¡¯ç¤ºä¸€èˆ¬è¨Šæ¯ -Comment[zh_TW]=資訊訊æ¯å·²é¡¯ç¤º default_sound=KDE_Chimes_2.ogg default_presentation=65 nopresentation=18 [messageWarning] Name=Warning message -Name[af]=Waarskuwing boodskap -Name[ar]=رسالة تØذيرية -Name[az]=XÉ™bÉ™rdarlıq ismarışı -Name[be]=ПапÑÑ€Ñджанне -Name[bg]=Предупреждение -Name[bn]=সতরà§à¦•à¦¬à¦¾à¦°à§à¦¤à¦¾ -Name[bs]=Poruka upozorenja -Name[ca]=Missatge d'avÃs -Name[cs]=Varovná zpráva -Name[csb]=Ã’strzegawczi kòmùnikat -Name[cy]=Neges rhybudd -Name[da]=Advarselsbesked -Name[de]=Warnung -Name[el]=Μήνυμα Ï€Ïοειδοποίησης -Name[eo]=Averta mesaÄo -Name[es]=Mensaje de aviso -Name[et]=Hoiatav teade -Name[eu]=Abisuaren mezua -Name[fa]=پیام اخطار -Name[fi]=Varoitusviesti -Name[fr]=Message d'avertissement -Name[fy]=Warskôgings berjocht -Name[ga]=Teachtaireacht Rabhaidh -Name[gl]=Mensaxe de aviso -Name[he]=הודעת הזהרה -Name[hi]=चेतावनी संदेश -Name[hr]=Poruka upozorenja -Name[hsb]=Warnowanska zdźělenka -Name[hu]=FigyelmeztetÅ‘ üzenet -Name[id]=Pesan peringatan -Name[is]=Aðvörun -Name[it]=Messaggio di avvertimento -Name[ja]=è¦å‘Šãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ -Name[ka]=გáƒáƒ¤áƒ თხილებრ-Name[kk]=ЕÑкерту хабары -Name[km]=សារ​ព្រមាន -Name[ko]=ê²½ê³ ë©”ì„¸ì§€ -Name[lb]=Warnung -Name[lt]=PerspÄ—jantis praneÅ¡imas -Name[lv]=BrÄ«dinÄjums -Name[mk]=Предупредувачка порака -Name[mn]=Сануулга мÑдÑÑ -Name[ms]=Mesej amaran -Name[nb]=Varselmelding -Name[nds]=Wohrschoen -Name[ne]=चेतावनी सनà¥à¤¦à¥‡à¤¶ -Name[nl]=Waarschuwingsbericht -Name[nn]=Varselmelding -Name[pa]=ਚੇਤਾਵਨੀ ਸà©à¨¨à©‡à¨¹à¨¾ -Name[pl]=Komunikat ostrzegawczy -Name[pt]=Mensagem de aviso -Name[pt_BR]=Mensagem de Aviso -Name[ro]=Mesaj de avertizare -Name[ru]=Предупреждение -Name[rw]=Ubutumwa bw'iburira -Name[se]=Váruhus -Name[sk]=Varovanie -Name[sl]=Opozorilno sporoÄilo -Name[sq]=Porosi vërejtjeje -Name[sr]=Упозоравајућа порука -Name[sr@Latn]=Upozoravajuća poruka -Name[sv]=Varningsmeddelande -Name[ta]=எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆà®šà¯ செயà¯à®¤à®¿ -Name[te]=హెచà±à°šà°°à°¿à°• సందేశం -Name[tg]=Огоҳӣ -Name[th]=ข้à¸à¸„วามà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™ -Name[tr]=Uyarı mesajı -Name[tt]=Kisätü xäbäre -Name[uk]=ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ -Name[uz]=Ogohnoma xabari -Name[uz@cyrillic]=Огоҳнома хабари -Name[vi]=Thông Ä‘iệp cảnh báo -Name[wa]=Messaedje d' adviertixhmint -Name[zh_CN]=è¦å‘Šæ¶ˆæ¯ -Name[zh_HK]=è¦å‘Šè¨Šæ¯ -Name[zh_TW]=è¦å‘Šè¨Šæ¯ Comment=A warning message is being shown -Comment[af]='n Waarskuwing boodskap word vertoon -Comment[ar]=تظهر الآن رسالة تØذيرية -Comment[az]=XÉ™bÉ™rdarlıq ismarışı göstÉ™rilir -Comment[be]=Паказана папÑÑ€Ñджанне -Comment[bg]=Показване на предупредително Ñъобщение (Предупреждение) -Comment[bn]=à¦à¦•à¦Ÿà¦¿ সতরà§à¦•à¦¬à¦¾à¦°à§à¦¤à¦¾ পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ হচà§à¦›à§‡ -Comment[bs]=Prikazana je poruka upozorenja -Comment[ca]=Mostrarà un missatge d'avÃs -Comment[cs]=Varovná zpráva je zobrazena -Comment[csb]=Wëskrzëniwô sã òstrzegawczi kòmùnikat -Comment[cy]=Dangosir neges rhybudd -Comment[da]=En advarselsbesked er ved at blive vist -Comment[de]=Anzeige einer Warnungs-Nachricht -Comment[el]=Ένα μήνυμα Ï€Ïοειδοποίησης εμφανίζεται -Comment[eo]=Averta mesaÄo estas montrata -Comment[es]=Se está mostrando un mensaje de aviso -Comment[et]=Näidatakse hoiatavat teadet -Comment[eu]=Abisuaren mezua erakusten ari da -Comment[fa]=پیام اخطار نمایش داده می‌شود -Comment[fi]=Näytetään varoitusviesti -Comment[fr]=Un message d'avertissement est affiché actuellement -Comment[fy]=In warskôgings berjocht lit him sjen -Comment[ga]=Tá teachtaireacht rabhaidh á taispeáint -Comment[gl]=Está-se a mostrar unha mensaxe de aviso -Comment[he]=מוצגת הדעת הזהרה -Comment[hi]=à¤à¤• चेतावनी सूचना दिखाई जा रही है -Comment[hr]=Prikazana je upozoravajuća poruka -Comment[hsb]=Warnowanska zdźělenka so pokazuje -Comment[hu]=FigyelmeztetÅ‘ üzenet látszik -Comment[id]=Pesan peringatan sedang ditampilkan -Comment[is]=Aðvörun til notanda -Comment[it]=Viene mostrato un messaggio di avvertimento -Comment[ja]=è¦å‘Šãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ -Comment[ka]=გáƒáƒ¤áƒ თხილების ჩვენებრ-Comment[kk]=ЕÑкерту хабары көрÑтілуде -Comment[km]=កំពុង​បង្ហាញ​សារ​ព្រមាន​មួយ -Comment[ko]=ê²½ê³ ë©”ì„¸ì§€ê°€ 보입니다 -Comment[lb]=Eng Warnungsnoricht gëtt ugewisen -Comment[lt]=Rodomas perspÄ—jantis praneÅ¡imas -Comment[lv]=Tiek rÄdÄ«ts brÄ«dinÄjums -Comment[mk]=Прикажана е предупредувачка порака -Comment[mn]=Харуулж байхад Ñануулга -Comment[ms]=Mesej amaran yang dipaparkan -Comment[nb]=En varselmelding blir vist -Comment[nds]=En Wohrschoen warrt wiest -Comment[ne]=चेतावनी सनà¥à¤¦à¥‡à¤¶ देखिरहेको छ -Comment[nl]=Er wordt een waarschuwingsbericht getoond -Comment[nn]=Ei varselmelding vert vist -Comment[pa]=ਇੱਕ ਚੇਤਾਵਨੀ ਸà©à¨¨à©‡à¨¹à¨¾ ਹੇਠਾਂ ਵੇਖਿਆ ਗਿਆ ਹੈ -Comment[pl]=Pokazywany jest komunikat ostrzegawczy -Comment[pt]=Está a ser mostrada uma mensagem de aviso -Comment[pt_BR]=Uma mensagem de aviso está sendo mostrada -Comment[ro]=A fost afiÅŸat un mesaj de avertizare -Comment[ru]=Вывод Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ -Comment[rw]=Ubutumwa bw'iburira bwerekanwe -Comment[se]=Váruhus Äájehuvvo -Comment[sk]=Je zobrazené varovanie -Comment[sl]=Prikazano je opozorilno sporoÄilo -Comment[sq]=Një porosi vërejtjeje është paraqitur -Comment[sr]=Приказана је упозоравајућа порука -Comment[sr@Latn]=Prikazana je upozoravajuća poruka -Comment[sv]=Varningsmeddelande visas -Comment[ta]=ஒர௠எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ செயà¯à®¤à®¿ காணà¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯ -Comment[te]=à°’à°• హెచà±à°šà°°à°¿à°• సందేశం చూపించబడà±à°¤à±à°‚ది -Comment[tg]=Хурӯҷи огоҳӣ -Comment[th]=à¸à¸³à¸¥à¸±à¸‡à¹à¸ªà¸”งข้à¸à¸„วามà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸à¸™ -Comment[tr]=Bir uyarı mesajı gösterildi -Comment[tt]=Kisätü xäbäre kürsätelä -Comment[uk]=ПоказуєтьÑÑ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· попередженнÑм -Comment[uz]=Ogohnoma xabari koÊ»rsatildi -Comment[uz@cyrillic]=Огоҳнома хабари кўрÑатилди -Comment[vi]=Má»™t thông Ä‘iệp cảnh báo Ä‘ang được hiển thị. -Comment[wa]=On messaedje d' adviertixhmint est hÃ¥yné -Comment[zh_CN]=æ£åœ¨æ˜¾ç¤ºè¦å‘Šæ¶ˆæ¯ -Comment[zh_HK]=顯示è¦å‘Šè¨Šæ¯ -Comment[zh_TW]=è¦å‘Šè¨Šæ¯å·²é¡¯ç¤º default_sound=KDE_Error_1.ogg default_presentation=65 nopresentation=18 @@ -2421,157 +92,7 @@ level=2 [messageCritical] Name=Critical message -Name[af]=Kritiese boodskap -Name[ar]=رسالة هامَة -Name[az]=Kritik ismarış -Name[be]=Важнае паведамленне -Name[bg]=Грешка -Name[bn]=গà§à¦°à§à¦¤à§à¦¬à¦ªà§‚রà§à¦£ বারà§à¦¤à¦¾ -Name[bs]=KritiÄna poruka -Name[ca]=Missatge crÃtic -Name[cs]=Kritická zpráva -Name[csb]=Kòmunikat kriticzny felë -Name[cy]=Neges critigol -Name[da]=Kritisk besked -Name[de]=Kritisches Ereignis -Name[el]=ΚÏίσιμο μήνυμα -Name[eo]=Averta mesaÄo -Name[es]=Mensaje crÃtico -Name[et]=Kriitiline teade -Name[eu]=Mezu kritikoa -Name[fa]=پیام بØرانی -Name[fi]=Kriittinen viesti -Name[fr]=Message critique -Name[fy]=krityk berjocht -Name[ga]=Teachtaireaacht chriticiúil -Name[gl]=Mensaxe crÃtica -Name[he]=הודעה קריטית -Name[hi]=महतà¥à¤µà¤ªà¥‚रà¥à¤£ संदेश -Name[hr]=KritiÄna poruka -Name[hsb]=Kritiska zdźělenka -Name[hu]=Kritikus hibaüzenet -Name[id]=Pesan kritis -Name[is]=Alvarleg aðvörun -Name[it]=Messaggio critico -Name[ja]=クリティカルメッセージ -Name[ka]=კრიტიკული შეცდáƒáƒ›áƒ -Name[kk]=ДағдарыÑÑ‚Ñ‹ хабар -Name[km]=សារ​សំážáž¶áž“់ -Name[ko]=중요 메세지 -Name[lb]=Kritesch Noricht -Name[lt]=Kritinis praneÅ¡imas -Name[lv]=Kritisks paziņojums -Name[mk]=Критична порака -Name[mn]=ШүүмжлÑлт мÑдÑÑ -Name[ms]=Mesej Kritikal -Name[nb]=Kritisk melding -Name[nds]=Malöör -Name[ne]=आलोचनातà¥à¤®à¤• सनà¥à¤¦à¥‡à¤¶ -Name[nl]=Kritiek bericht -Name[nn]=Kritisk melding -Name[pa]=ਘਾਤਕ ਸà©à¨¨à©‡à¨¹à¨¾ -Name[pl]=Komunikat bÅ‚Ä™du krytycznego -Name[pt]=Mensagem crÃtica -Name[pt_BR]=Mensagem CrÃtica -Name[ro]=Mesaj situaÅ£ie critică -Name[ru]=КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° -Name[rw]=Ubutumwa bunenga -Name[sk]=Kritická správa -Name[sl]=KritiÄno sporoÄilo -Name[sq]=Porosi Kritik -Name[sr]=Критична порука -Name[sr@Latn]=KritiÄna poruka -Name[sv]=Kritiskt meddelande -Name[ta]=இகà¯à®•à®Ÿà¯à®Ÿà®¾à®© செயà¯à®¤à®¿ -Name[te]=కీలక సందేశం -Name[tg]=Хатои хатарнок -Name[th]=ข้à¸à¸„วามวิà¸à¸¤à¸•à¸´ -Name[tr]=Kritik hata mesajı -Name[tt]=Kisken xäl xäbäre -Name[uk]=Критична помилка -Name[uz]=Muammo xabari -Name[uz@cyrillic]=Муаммо хабари -Name[vi]=Thông Ä‘iệp tá»›i hạn -Name[wa]=Messaedje critike -Name[zh_CN]=å…³é”®æ¶ˆæ¯ -Name[zh_HK]=åš´é‡è¦å‘Šè¨Šæ¯ -Name[zh_TW]=åš´é‡è¦å‘Šè¨Šæ¯ Comment=A critical message is being shown -Comment[af]='n Kritiese boodskap word vertoon -Comment[ar]=تظهر الآن رسالة مهمَة -Comment[az]=Kritik ismarış göstÉ™rilir -Comment[be]=Паказана важнае паведамленне -Comment[bg]=Показване на Ñъобщение за грешка (Грешка) -Comment[bn]=à¦à¦•à¦Ÿà¦¿ গà§à¦°à§à¦¤à¦° বারà§à¦¤à¦¾ পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤ হচà§à¦›à§‡ -Comment[bs]=Prikazana je kritiÄna poruka -Comment[ca]=Mostrarà un missatge crÃtic -Comment[cs]=Kritická zpráva je zobrazena -Comment[csb]=Wëskrzëniwô sã kòmunikat kriticzny felë -Comment[cy]=Dangosir neges critigol -Comment[da]=En kritisk besked er ved at blive vist -Comment[de]=Anzeige einer Nachricht zu einem kritischen Ereignis -Comment[el]=Ένα κÏίσιμο μήνυμα εμφανίζεται -Comment[eo]=Gravega mesaÄo estas montrata -Comment[es]=Se está mostrando un mensaje crÃtico -Comment[et]=Näidatakse kriitilist teadet -Comment[eu]=Mezu kritikoa erakusten ari da -Comment[fa]=پیام بØرانی نمایش داده می‌شود -Comment[fi]=Näytetään kriittinen viesti -Comment[fr]=Un message critique est affiché actuellement -Comment[fy]=In krityk berjocht let him sjen -Comment[ga]=Tá teachtaireacht chriticiúil á taispeáint -Comment[gl]=Está-se a mostrar unha mensaxe crÃtica -Comment[he]=מוצגת הודעה קריטית -Comment[hi]=à¤à¤• महतà¥à¤µà¤ªà¥‚रà¥à¤£ सूचना दिखाई जा रही है -Comment[hr]=Prikazana je kritiÄna poruka -Comment[hsb]=Kritiska zdźělenka so pokazuje -Comment[hu]=Kritikus hibaüzenet látszik -Comment[id]=Pesan kritis sedang ditampilkan -Comment[is]=Alvarleg skilaboð -Comment[it]=Viene mostrato un messaggio critico -Comment[ja]=クリティカルメッセージを表示ã—ã¾ã™ -Comment[ka]=კრიტიკული შეცდáƒáƒ›áƒ˜áƒ¡ ჩვენებრ-Comment[kk]=ДағдарыÑÑ‚Ñ‹ хабар көрÑетілуде -Comment[km]=កំពុង​បង្ហាញ​សារ​សំážáž¶áž“់​មួយ -Comment[ko]=중요 메세지가 보입니다 -Comment[lb]=Eng kritesch Noricht gëtt ugewisen -Comment[lt]=Rodomas kritinis praneÅ¡imas -Comment[lv]=Tiek rÄdÄ«ts kritisks paziņojums -Comment[mk]=Прикажана е критична порака -Comment[mn]=Харуулж байхад шүүмжилÑлт Ñануулга -Comment[ms]=Mesej kritikal yang dipaparkan -Comment[nb]=En kritisk melding blir vist -Comment[nds]=En kritische Naricht warrt wiest -Comment[ne]=आलोचनातà¥à¤®à¤• सनà¥à¤¦à¥‡à¤¶ देखिरहेको छ -Comment[nl]=Er wordt een kritiek bericht getoond -Comment[nn]=Ei kritisk melding vert vist -Comment[pa]=ਇੱਕ ਘਾਤਕ ਸà©à¨¨à©‡à¨¹à¨¾ ਹੇਠਾਂ ਵੇਖਿਆ ਗਿਆ ਹੈ -Comment[pl]=Pokazywany jest komunikat o bÅ‚Ä™dzie krytycznym -Comment[pt]=Está a ser mostrada uma mensagem crÃtica -Comment[pt_BR]=Uma mensagem crÃtica está sendo mostrada -Comment[ro]=A fost afiÅŸat un mesaj de situaÅ£ie critică -Comment[ru]=Вывод критичеÑкого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ -Comment[rw]=Ubutumwa bunenga bwerekanwe -Comment[sk]=Je zobrazená kritická správa -Comment[sl]=Prikazano je kritiÄno sporoÄilo -Comment[sq]=Një porosi kritike është paraqitur -Comment[sr]=Приказана је критична порука -Comment[sr@Latn]=Prikazana je kritiÄna poruka -Comment[sv]=Kritiskt meddelande visas -Comment[ta]=ஒர௠மாறà¯à®¨à®¿à®²à¯ˆà®¯à®¾à®© செயà¯à®¤à®¿ காணà¯à®ªà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯ -Comment[te]=à°’à°• కీలక సందేశం చూపించబడà±à°¤à±à°‚ది -Comment[tg]=Хурӯҷи иттилоъи хатарнок -Comment[th]=à¸à¸³à¸¥à¸±à¸‡à¹à¸ªà¸”งข้à¸à¸„วามวิà¸à¸¤à¸•à¸´ -Comment[tr]=Bir kritik mesaj gösterildi -Comment[tt]=Kisken xäl xäbäre kürsätelä -Comment[uk]=ПоказуєтьÑÑ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ критичну помилку -Comment[uz]=Muammo xabari koÊ»rsatildi -Comment[uz@cyrillic]=Муаммо хабари кўрÑатилди -Comment[vi]=Má»™t thông Ä‘iệp vá» trÆ°á»ng hợp tá»›i hạn Ä‘ang được hiển thị. -Comment[wa]=On messaedje critike est hÃ¥yné -Comment[zh_CN]=æ£åœ¨æ˜¾ç¤ºå…³é”®æ¶ˆæ¯ -Comment[zh_HK]=顯示嚴é‡è¦å‘Šè¨Šæ¯ -Comment[zh_TW]=åš´é‡çš„è¦å‘Šè¨Šæ¯å·²é¡¯ç¤º default_sound=KDE_Error_1.ogg default_presentation=65 nopresentation=18 @@ -2579,163 +100,7 @@ level=4 [messageboxQuestion] Name=Question -Name[af]=Vraag -Name[ar]=سؤال -Name[az]=Sual -Name[be]=Запыт -Name[bg]=Ð’ÑŠÐ¿Ñ€Ð¾Ñ -Name[bn]=পà§à¦°à¦¶à§à¦¨ -Name[br]=Goulenn -Name[bs]=Pitanje -Name[ca]=Pregunta -Name[cs]=Dotaz -Name[csb]=Pëtanié -Name[cy]=Cwestiwn -Name[da]=SpørgsmÃ¥l -Name[de]=Frage -Name[el]=ΕÏώτηση -Name[eo]=Demando -Name[es]=Pregunta -Name[et]=Küsimus -Name[eu]=Galdera -Name[fa]=سؤال -Name[fi]=Kysymys -Name[fy]=Fraach -Name[ga]=Ceist -Name[gl]=Pergunta -Name[he]=ש×לה -Name[hi]=पà¥à¤°à¤¶à¥à¤¨ -Name[hr]=Pitanje -Name[hsb]=PraÅ¡enje -Name[hu]=Kérdés -Name[id]=Pertanyaan -Name[is]=Spurning -Name[it]=Domanda -Name[ja]=è³ªå• -Name[ka]=შეკითხვრ-Name[kk]=Сұрақ -Name[km]=សំណួរ -Name[ko]=ë¬¼ìŒ -Name[ku]=Pirs -Name[lb]=Fro -Name[lt]=Klausimas -Name[lv]=JautÄjums -Name[mk]=Прашање -Name[mn]=ÐÑуулт -Name[ms]=Soalan -Name[nb]=SpørsmÃ¥l -Name[nds]=Fraag -Name[ne]=पà¥à¤°à¤¶à¥à¤¨ -Name[nl]=Vraag -Name[nn]=SpørsmÃ¥l -Name[pa]=ਸਵਾਲ -Name[pl]=Komunikat z pytaniem -Name[pt]=Pergunta -Name[pt_BR]=Questão -Name[ro]=ÃŽntrebare -Name[ru]=Ð’Ð¾Ð¿Ñ€Ð¾Ñ -Name[rw]=Ikibazo -Name[se]=Gažaldat -Name[sk]=Otázka -Name[sl]=VpraÅ¡anje -Name[sq]=Pyetje -Name[sr]=Питање -Name[sr@Latn]=Pitanje -Name[sv]=FrÃ¥ga -Name[ta]=கேளà¯à®µà®¿ -Name[te]=à°ªà±à°°à°¶à±à°¨ -Name[tg]=Савол -Name[th]=คำถาม -Name[tr]=Soru -Name[tt]=Soraw -Name[uk]=Ð—Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ -Name[uz]=Savol -Name[uz@cyrillic]=Савол -Name[vi]=Câu há»i -Name[wa]=Kesse -Name[zh_CN]=问题 -Name[zh_HK]=æå• -Name[zh_TW]=å•é¡Œ Comment=A question is being asked -Comment[af]='n Vraag word gevra -Comment[ar]=هناك سؤال يتم سؤاله -Comment[az]=Sual ismarışı göstÉ™rilir -Comment[be]=Зададзена пытанне -Comment[bg]=Показване на въпроÑително Ñъобщение (ВъпроÑ) -Comment[bn]=à¦à¦•à¦Ÿà¦¿ পà§à¦°à¦¶à§à¦¨ করা হচà§à¦›à§‡ -Comment[br]=Emañ o c'houlleniñ ur goulenn -Comment[bs]=Postavljeno je pitanje -Comment[ca]=Farà una pregunta -Comment[cs]=Je položena otázka -Comment[csb]=Zadóné je pëtanié -Comment[cy]=Gofynnir cwestiwn -Comment[da]=Et spørgsmÃ¥l er ved at blive stillet -Comment[de]=Anzeige einer Frage -Comment[el]=Γίνεται μια εÏώτηση -Comment[eo]=Demando estas demandata -Comment[es]=Se está haciendo una pregunta -Comment[et]=Esitatakse küsimus -Comment[eu]=Galdera egiten ari da -Comment[fa]=سؤالی پرسیده می‌شود -Comment[fi]=Kysytään kysymys -Comment[fr]=Une question est posée actuellement -Comment[fy]=In fraach is stelt -Comment[ga]=Tá ceist á cur. -Comment[gl]=Está-se a facer unha pergunta -Comment[he]=× ×©×לת ש×לה -Comment[hi]=à¤à¤• पà¥à¤°à¤¶à¥à¤¨ पूछा गया है -Comment[hr]=Postavljeno je pitanje -Comment[hsb]=PraÅ¡a so za nÄ›Äim -Comment[hu]=Kérdés a felhasználóhoz -Comment[id]=Pertanyaan sedang diajukan -Comment[is]=Spurt er -Comment[it]=Viene posta una domanda -Comment[ja]=質å•ãŒå‡ºã•ã‚Œã¦ã„ã¾ã™ -Comment[ka]=შეკითხვის დáƒáƒ¡áƒ›áƒ -Comment[kk]=Сұрақ койылуда -Comment[km]=កំពុង​សួរ​សំណួរ​មួយ -Comment[ko]=ë¬¼ì–´ë³´ê² ìŠµë‹ˆë‹¤ -Comment[lb]=Eng Fro gëtt ugewisen -Comment[lt]=Užduodamas klausimas -Comment[lv]=Tiek uzdots jautÄjums -Comment[mk]=ПоÑтавено е прашање -Comment[mn]=ÐÑуулт тавигдаж байна -Comment[ms]=Soalan yang ditanya -Comment[nb]=Et spørsmÃ¥l blir stillt -Comment[nds]=En Fraag warrt stellt -Comment[ne]=पà¥à¤°à¤¶à¥à¤¨ सोधिराखेको छ -Comment[nl]=Er wordt een vraag gesteld -Comment[nn]=Eit spørsmÃ¥l vert spurd -Comment[pa]=ਇੱਕ ਸਵਾਲ ਪà©à¨›à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ -Comment[pl]=Zadawane jest pytanie -Comment[pt]=Está´a ser feita uma pergunta -Comment[pt_BR]=Uma pergunta está sendo feita -Comment[ro]=A fost pusă o întrebare -Comment[ru]=Вывод вопроÑа -Comment[rw]=Ikibazo cyabajijwe -Comment[se]=Gažaldat jearahuvvo -Comment[sk]=Je zobrazená otázka -Comment[sl]=Postavljeno je vpraÅ¡anje -Comment[sq]=Një pyetje është duke u pyetur -Comment[sr]=ПоÑтављено је питање -Comment[sr@Latn]=Postavljeno je pitanje -Comment[sv]=FrÃ¥ga ställs -Comment[ta]=ஒர௠கேளà¯à®µà®¿ கேடà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯ -Comment[te]=à°ªà±à°°à°¶à±à°¨ అడగబడà±à°¤à±à°¨à±à°¨à°¦à°¿ -Comment[tg]=Ҷавоби Ñавол -Comment[th]=à¸à¸³à¸¥à¸±à¸‡à¸–ามคำถาม -Comment[tr]=Bir soru soruldu -Comment[tt]=Ber soraw birelde -Comment[uk]=ПоказуєтьÑÑ Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ -Comment[uz]=Savol berildi -Comment[uz@cyrillic]=Савол берилди -Comment[vi]=Má»™t câu Ä‘ang được há»i. -Comment[wa]=Ene kesse est dmandêye -Comment[zh_CN]=æ£åœ¨æé—® -Comment[zh_HK]=顯示æå•è¨Šæ¯ -Comment[zh_TW]=å•é¡Œè©¢å•ä¸ default_sound=KDE_Vox_Ahem.ogg default_presentation=65 nopresentation=18 - - diff --git a/tdecore/fixx11h.h b/tdecore/fixx11h.h index e572335a1..eb6266444 100644 --- a/tdecore/fixx11h.h +++ b/tdecore/fixx11h.h @@ -16,7 +16,7 @@ symbols may now refer to different variables (e.g. if X11 #defined NoButton, after this file is included NoButton would no longer be X11's - NoButton, but Qt::NoButton instead). At this time, + NoButton, but TQt::NoButton instead). At this time, there's no conflict known that could cause problems. The original X11 symbols are still accessible diff --git a/tdecore/generate_keys.sh b/tdecore/generate_keys.sh index d0fea1cdd..61987b57e 100755 --- a/tdecore/generate_keys.sh +++ b/tdecore/generate_keys.sh @@ -18,7 +18,7 @@ sed -n '/enum Key/!d | sed -n 's/\s*Key_/{ "/ s/,.*$/ },/ s/ =/",/ - s/Key_/Qt::Key_/ + s/Key_/TQt::Key_/ $s/.*/& }/ p' \ > kckey_a diff --git a/tdecore/kapp.h b/tdecore/kapp.h deleted file mode 100644 index 5d48a852f..000000000 --- a/tdecore/kapp.h +++ /dev/null @@ -1,6 +0,0 @@ -// kapp.h is the old name. Use #include <tdeapplication.h> from now on -#ifdef KDE_NO_COMPAT -#error include <tdeapplication.h> instead of <kapp.h> -#else -#include <tdeapplication.h> -#endif diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index 38bafaef8..0da2ced26 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -18,12 +18,12 @@ */ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include "kcheckaccelerators.h" -#include "kappdcopiface.h" +#include "tdeappdcopinterface.h" #include <qassistantclient.h> #include <tqdir.h> @@ -46,12 +46,12 @@ void TDEApplication_init_windows(bool /*GUIenabled*/) + "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" ); QTranslator *qt_transl = new QTranslator(); if (qt_transl->load( qt_transl_file, "")) - kapp->installTranslator( qt_transl ); + tdeApp->installTranslator( qt_transl ); else delete qt_transl; } -//unsafe; create kapplication_p.h instead! +//unsafe; create tdeapplication_p.h instead! typedef void* IceIOErrorHandler; class TDEApplicationPrivate @@ -69,7 +69,7 @@ public: TQString geometry_arg; TQCString startup_id; TQTimer* app_started_timer; - KAppDCOPInterface *m_KAppDCOPInterface; + TDEAppDCOPInterface *m_TDEAppDCOPInterface; bool session_save; QAssistantClient* qassistantclient; }; diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h index 88b904a55..bd1ca41c2 100644 --- a/tdecore/kasyncio.h +++ b/tdecore/kasyncio.h @@ -25,10 +25,6 @@ #include <tqiodevice.h> #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define USE_QT4 -#endif // Q_MOC_RUN - class KAsyncIOPrivate; /** * Asynchronous I/O Support @@ -39,14 +35,9 @@ class KAsyncIOPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short Asynchronous I/O support */ -class TDECORE_EXPORT KAsyncIO: -#ifdef USE_QT4 -#else // USE_QT4 -public TQObject, -#endif // USE_QT4 -public TQIODevice +class TDECORE_EXPORT KAsyncIO: public TQObject, public TQIODevice { - Q_OBJECT + TQ_OBJECT protected: KAsyncIO() // cannot be accessed externally diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h index 327713e6d..ce26a1e9a 100644 --- a/tdecore/kaudioplayer.h +++ b/tdecore/kaudioplayer.h @@ -48,13 +48,13 @@ class KAudioPlayerPrivate; * * \code * KAudioPlayer player("/var/share/foo.wav"); - * connect(&button, TQT_SIGNAL(clicked()), &player, TQT_SLOT(play())); + * connect(&button, TQ_SIGNAL(clicked()), &player, TQ_SLOT(play())); * \endcode * */ //REVISED: hausmann class TDECORE_EXPORT KAudioPlayer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Constructor. diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp index 7a080ec68..d1ba6dcf2 100644 --- a/tdecore/kbufferedio.cpp +++ b/tdecore/kbufferedio.cpp @@ -111,22 +111,12 @@ bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) return true; } -#ifdef USE_QT3 int TDEBufferedIO::bytesAvailable() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 TDEBufferedIO::bytesAvailable() const -#endif // USE_QT4 { return readBufferSize(); } -#ifdef USE_QT3 int TDEBufferedIO::bytesToWrite() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 TDEBufferedIO::bytesToWrite() const -#endif // USE_QT4 { return writeBufferSize(); } diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h index f00ab52b6..f51b46a60 100644 --- a/tdecore/kbufferedio.h +++ b/tdecore/kbufferedio.h @@ -55,7 +55,7 @@ class TDEBufferedIOPrivate; */ class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO { - Q_OBJECT + TQ_OBJECT protected: @@ -118,12 +118,7 @@ public: * Returns the number of bytes available for reading in the read buffer * @return the number of bytes available for reading */ -#ifdef USE_QT3 virtual int bytesAvailable() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif // USE_QT4 /** * Waits for more data to be available and returns the amount of available data then. @@ -137,12 +132,7 @@ public: * Returns the number of bytes yet to write, still in the write buffer * @return the number of unwritten bytes in the write buffer */ -#ifdef USE_QT3 virtual int bytesToWrite() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesToWrite() const; -#endif // USE_QT4 /** * Checks whether there is enough data in the buffer to read a line diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp index 9d4d14661..d4f53fc39 100644 --- a/tdecore/kcalendarsystemgregorian.cpp +++ b/tdecore/kcalendarsystemgregorian.cpp @@ -58,7 +58,7 @@ int KCalendarSystemGregorian::weeksInYear(int year) const // If the last day of the year is in the first week, we have to check the // week before if ( temp.weekNumber() == 1 ) - temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); + temp = temp.addDays(-7); return temp.weekNumber(); } @@ -221,17 +221,17 @@ bool KCalendarSystemGregorian::setYMD(TQDate & date, int y, int m, int d) const TQDate KCalendarSystemGregorian::addYears(const TQDate & date, int nyears) const { - return TQT_TQDATE_OBJECT(date.addYears(nyears)); + return date.addYears(nyears); } TQDate KCalendarSystemGregorian::addMonths(const TQDate & date, int nmonths) const { - return TQT_TQDATE_OBJECT(date.addMonths(nmonths)); + return date.addMonths(nmonths); } TQDate KCalendarSystemGregorian::addDays(const TQDate & date, int ndays) const { - return TQT_TQDATE_OBJECT(date.addDays(ndays)); + return date.addDays(ndays); } TQString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp index 2f0aa111a..e0737c5b3 100644 --- a/tdecore/kcalendarsystemhebrew.cpp +++ b/tdecore/kcalendarsystemhebrew.cpp @@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const int nWeekNumber = weekNumber(temp); if(nWeekNumber == 1) // last week belongs to next year { - temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); + temp = temp.addDays(-7); nWeekNumber = weekNumber(temp); } @@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const // Ok TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } // Ok diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp index cc66805e0..ef94b590f 100644 --- a/tdecore/kcalendarsystemhijri.cpp +++ b/tdecore/kcalendarsystemhijri.cpp @@ -539,7 +539,7 @@ int KCalendarSystemHijri::weekDayOfPray() const TQDate KCalendarSystemHijri::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } TQDate KCalendarSystemHijri::addMonths( const TQDate & date, int nmonths ) const diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp index 631693e45..3c71ca442 100644 --- a/tdecore/kcalendarsystemjalali.cpp +++ b/tdecore/kcalendarsystemjalali.cpp @@ -304,7 +304,7 @@ TQDate KCalendarSystemJalali::addMonths( const TQDate & date, int nmonths ) cons TQDate KCalendarSystemJalali::addDays( const TQDate & date, int ndays ) const { - return TQT_TQDATE_OBJECT(date.addDays( ndays )); + return date.addDays( ndays ); } int KCalendarSystemJalali::monthsInYear( const TQDate & date ) const diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp index 24d0193b2..d91338d1f 100644 --- a/tdecore/kcatalogue.cpp +++ b/tdecore/kcatalogue.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include "kcatalogue.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file, const char *msgid); diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 3483039a7..47053223f 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str) TQChar res = TQChar::null; int pos = 0; - if(str[pos] == (QChar)'&') pos++; + if(str[pos] == (TQChar)'&') pos++; // Check for '�' or '�' sequence - if (str[pos] == (QChar)'#' && str.length()-pos > 1) { + if (str[pos] == (TQChar)'#' && str.length()-pos > 1) { bool ok; pos++; - if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') { + if (str[pos] == (TQChar)'x' || str[pos] == (TQChar)'X') { pos++; // '�', hexadeciaml character reference TQString tmp(str.unicode()+pos, str.length()-pos); @@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len) { TQString tmp = str.left(len); TQChar res = fromEntity(tmp); - if( res != (QChar)TQChar::null ) return res; + if( res != (TQChar)TQChar::null ) return res; len--; } return TQChar::null; @@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input ) for ( ; p < end; ++p ) { const TQChar ch = *p; - if ( ch == (QChar)'&' ) { + if ( ch == (TQChar)'&' ) { ampersand = p; scanForSemicolon = true; continue; } - if ( ch != (QChar)';' || scanForSemicolon == false ) + if ( ch != (TQChar)';' || scanForSemicolon == false ) continue; assert( ampersand ); diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index 306591e67..93ed7f86a 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -89,7 +89,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) } alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); - connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot())); + connect( &autoCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( autoCheckSlot())); } bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) @@ -99,11 +99,11 @@ bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) switch ( e->type() ) { // just simplify debuggin case TQEvent::Accel: - if ( key && (TQT_TQKEYEVENT(e)->key() == key) ) { + if ( key && (static_cast<TQKeyEvent*>(e)->key() == key) ) { block = true; checkAccelerators( false ); block = false; - TQT_TQKEYEVENT(e)->accept(); + static_cast<TQKeyEvent*>(e)->accept(); return true; } break; @@ -153,11 +153,11 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic) TQCheckBox* disableAutoCheck = NULL; if( automatic ) { disableAutoCheck = new TQCheckBox( i18n( "&Disable automatic checking" ), drklash ); - connect(disableAutoCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableCheck(bool))); + connect(disableAutoCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableCheck(bool))); } TQPushButton* btnClose = new TQPushButton( i18n( "&Close" ), drklash ); btnClose->setDefault( true ); - connect( btnClose, TQT_SIGNAL( clicked() ), drklash, TQT_SLOT( close() ) ); + connect( btnClose, TQ_SIGNAL( clicked() ), drklash, TQ_SLOT( close() ) ); if (disableAutoCheck) disableAutoCheck->setFocus(); else @@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on) void KCheckAccelerators::checkAccelerators( bool automatic ) { - TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow()); + TQWidget* actWin = tqApp->activeWindow(); if ( !actWin ) return; diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h index 00adf4fd1..d16286c26 100644 --- a/tdecore/kcheckaccelerators.h +++ b/tdecore/kcheckaccelerators.h @@ -65,7 +65,7 @@ class TQTextView; */ class TDECORE_EXPORT KCheckAccelerators : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a KCheckAccelerators instance for the given object. diff --git a/tdecore/kckey.cpp b/tdecore/kckey.cpp index 0feea1d49..95232f0d7 100644 --- a/tdecore/kckey.cpp +++ b/tdecore/kckey.cpp @@ -76,7 +76,7 @@ const KKeys kde_KKEYS[NB_KEYS] = { { "Direction_L", 0x1059 }, { "Direction_R", 0x1060 }, { "Space", 0x20 }, // translated - { "Any", Qt::Key_Space }, + { "Any", TQt::Key_Space }, { "Exclam", 0x21 }, // translated { "QuoteDbl", 0x22 }, { "NumberSign", 0x23 }, // translated diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 8ab23cccc..369f88c3d 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false; TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( tdeApp, "KDE Clipboard" ); return s_self; } @@ -126,11 +126,11 @@ void TDEClipboardSynchronizer::setupSignals() TQClipboard *clip = TQApplication::clipboard(); disconnect( clip, NULL, this, NULL ); if( s_sync ) - connect( clip, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( clip, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); if( s_reverse_sync ) - connect( clip, TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardChanged() )); + connect( clip, TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardChanged() )); } void TDEClipboardSynchronizer::slotSelectionChanged() diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index 8ed8dcc91..df45027f1 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -35,7 +35,7 @@ */ class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Systray widget for manipulating the clipboard. */ diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index 2bce648fb..80f61d8ad 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -135,7 +135,7 @@ class TDECORE_EXPORT TDECompletion : public TQObject TQ_PROPERTY( CompOrder order READ order WRITE setOrder ) TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase ) TQ_PROPERTY( TQStringList items READ items WRITE setItems ) - Q_OBJECT + TQ_OBJECT public: /** @@ -873,7 +873,7 @@ public: * the key-binding simply simply @p sum up the values of the * modifier and the actual key. For example, to use CTRL+E as * a key binding for one of the items, you would simply supply - * @p "Qt::CtrlButton + Qt::Key_E" as the second argument to this + * @p "TQt::CtrlButton + TQt::Key_E" as the second argument to this * function. * * @param item the feature whose key-binding needs to be set: diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp index 714e445bc..babf888fd 100644 --- a/tdecore/kdcoppropertyproxy.cpp +++ b/tdecore/kdcoppropertyproxy.cpp @@ -121,6 +121,22 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object ) return res; } +#define MARSHAL( type ) \ + case TQVariant::type: \ + { \ + reply << prop.to##type(); \ + break; \ + } + +#define DEMARSHAL( type, val ) \ + case TQVariant::type: \ + { \ + val v; \ + stream >> v; \ + prop = TQVariant( v ); \ + break; \ + } + bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData, TQObject *object ) @@ -184,15 +200,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB if ( type == TQVariant::Invalid ) return false; -#define DEMARSHAL( type, val ) \ - case TQVariant::type: \ - { \ - val v; \ - stream >> v; \ - prop = TQVariant( v ); \ - } \ - break; - typedef TQValueList<TQVariant> ListType; typedef TQStringVariantMap MapType; @@ -251,11 +258,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB replyType = prop.typeName(); TQDataStream reply( replyData, IO_WriteOnly ); -#define MARSHAL( type ) \ - case TQVariant::type: \ - reply << prop.to##type(); \ - break; - switch ( prop.type() ) { MARSHAL( Cursor ) diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 14623fa4f..e71455362 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -3,346 +3,353 @@ # Applications of the kdenonbeta module (or similar) should not define any own area but use area 0. # When you add KDebug areas, email kde-devel@kde.org with the appropriate descriptions. # -#Format : number<tab>description - -125 tdecore (TDEAccel) -126 tdecore (KURL) -127 tdeio (KProtocolInfo) -128 tdecore (KRegExp) -129 tdecore (TDEAction) -130 tdeio (KPasswdServer) -131 tdecore (TDEAcceleratorManager) -150 tdecore (KLibLoader) -160 tdecore (KNotifyClient) -170 tdecore (KNetwork socket) -171 tdecore (KSocks) -172 tdecore (TDEStartupInfo) -173 tdecore (TDELocale) -174 tdecore (KProcIO) -175 tdecore (TDEProcess) -176 tdecore (KWin) -177 tdecore (TDEConfigSkeleton) -178 tdecore (TDEConfigDialogManager) -179 tdecore (KNetwork resolver) -180 tdecore (tdelibs) -200 tdeui (TDEMainWindow) -220 tdeui (TDEToolBar) -230 tdeui (KCommand) -240 tdeui (tdelibs) -250 tdefile (tdelibs) -264 tdecore (TDEIconLoader) -265 tdecore (TDEIconEffect) -270 tdeui (KRootPixmap) -280 tdeui (TDESharedPixmap) -281 tdeui (TDECModule) -282 tdeui (KDockWidget) -290 tdeui (KPixmapIO) -291 tdeui (TDEAboutDialog) -292 tdeui (KComboBox) -293 tdeui (KLineEdit) -294 tdeui (KEdit) -295 tdeui (KMenuBar) -296 tdeui (TDEPopupMenu) -298 tdeui (KDatePicker) -399 kimgio -400 artskde -500 tdeprint -700 tdeutils (KSettings::Dialog) -701 tdeutils (KSettings::Dispatcher) -702 tdeutils (KPluginSelector) -703 tdeutils (KPluginInfo) -704 tdeutils (KSettings::ComponentsDialog) -710 tdeutils (KCMultiDialog) -711 tdeutils (TDECModuleProxy) -712 tdeutils (TDECModuleInfo) -713 tdeutils (TDECModuleContainer) -750 tdespell (tdelibs) -760 tdemdi -780 tdecmshell (tdelibs) -790 tdeimproxy (tdelibs) -800 kabapi (tdelibs) -900 tdesu (tdelibs) -912 ksmartcard (tdelibs) - - -1000 tdeparts -1001 tdeparts (mainwindow) -1002 tdeparts (factory) +#Format : number<separator>description + +125 tdecore (TDEAccel) +126 tdecore (KURL) +127 tdeio (KProtocolInfo) +128 tdecore (KRegExp) +129 tdecore (TDEAction) +130 tdeio (KPasswdServer) +131 tdecore (TDEAcceleratorManager) +150 tdecore (KLibLoader) +160 tdecore (KNotifyClient) +170 tdecore (KNetwork socket) +171 tdecore (KSocks) +172 tdecore (TDEStartupInfo) +173 tdecore (TDELocale) +174 tdecore (TDEProcIO) +175 tdecore (TDEProcess) +176 tdecore (KWin) +177 tdecore (TDEConfigSkeleton) +178 tdecore (TDEConfigDialogManager) +179 tdecore (KNetwork resolver) +180 tdecore (tdelibs) +200 tdeui (TDEMainWindow) +220 tdeui (TDEToolBar) +230 tdeui (KCommand) +240 tdeui (tdelibs) +250 tdefile (tdelibs) +264 tdecore (TDEIconLoader) +265 tdecore (TDEIconEffect) +270 tdeui (KRootPixmap) +280 tdeui (TDESharedPixmap) +281 tdeui (TDECModule) +282 tdeui (KDockWidget) +290 tdeui (KPixmapIO) +291 tdeui (TDEAboutDialog) +292 tdeui (KComboBox) +293 tdeui (KLineEdit) +294 tdeui (KEdit) +295 tdeui (KMenuBar) +296 tdeui (TDEPopupMenu) +298 tdeui (KDatePicker) +399 kimgio +400 artskde +500 tdeprint +700 tdeutils (KSettings::Dialog) +701 tdeutils (KSettings::Dispatcher) +702 tdeutils (KPluginSelector) +703 tdeutils (KPluginInfo) +704 tdeutils (KSettings::ComponentsDialog) +710 tdeutils (KCMultiDialog) +711 tdeutils (TDECModuleProxy) +712 tdeutils (TDECModuleInfo) +713 tdeutils (TDECModuleContainer) +750 tdespell (tdelibs) +760 tdemdi +780 tdecmshell (tdelibs) +790 tdeimproxy (tdelibs) +800 kabapi (tdelibs) +900 tdesu (tdelibs) +912 ksmartcard (tdelibs) + + +1000 tdeparts +1001 tdeparts (mainwindow) +1002 tdeparts (factory) # tdebase -1201 konqtree -1202 konqueror -1203 libkonq -1204 kdesktop -1205 tdesud -1206 tdesu -1207 kdesktop (Minicli) -1208 kcontrol -1210 kicker -1211 konsole -1212 twin -1213 kappfinder -1214 kdesktop (icons) -1215 ksysguard -1216 twin (client errors) -1217 khotkeys -1218 ksmserver -1219 media tdeioslave -1220 remote tdeioslave - -1400 khelpcenter (tdebase) -1401 kcmhelpcenter -1402 khc_indexbuilder - -1420 kikbd -1421 ki18b_keys (tdecmodule) - -1430 nspluginviewer (Qt/Xt) -1431 nspluginviewer (plugin) -1432 nspluginviewer (part) -1433 nspluginscan +1201 konqtree +1202 konqueror +1203 libkonq +1204 kdesktop +1205 tdesud +1206 tdesu +1207 kdesktop (Minicli) +1208 kcontrol +1210 kicker +1211 konsole +1212 twin +1213 kappfinder +1214 kdesktop (icons) +1215 ksysguard +1216 twin (client errors) +1217 khotkeys +1218 ksmserver +1219 media tdeioslave +1220 remote tdeioslave + +1400 khelpcenter (tdebase) +1401 kcmhelpcenter +1402 khc_indexbuilder + +1420 kikbd +1421 ki18b_keys (tdecmodule) + +1430 nspluginviewer (Qt/Xt) +1431 nspluginviewer (plugin) +1432 nspluginviewer (part) +1433 nspluginscan # tdeutils -1501 khexedit (tdeutils) -1511 tdessh (tdeutils) -1512 tdepasswd (tdebase) -1601 ark (tdeutils) -1901 kfind -1902 kfind (KfindWindow::updateResults) -1903 kfind (KfindTabDialog::createQuery) -2000 kfind -2001 kregexpeditor -2002 kfloppy -2003 ksim -2100 kgpg -2200 kdf -2300 tdewallet - -# 2500-2999 Reserved for private use +1501 khexedit (tdeutils) +1511 tdessh (tdeutils) +1512 tdepasswd (tdebase) +1601 ark (tdeutils) +1901 kfind +1902 kfind (KfindWindow::updateResults) +1903 kfind (KfindTabDialog::createQuery) +2000 kfind +2001 kregexpeditor +2002 kfloppy +2003 ksim +2100 kgpg +2200 kdf +2300 tdewallet + +# 2500-2999 Reserved for private use # tdeadmin -3000 ksysv -3100 ksysv (model) +3000 ksysv +3100 ksysv (model) # tdegraphics -4300 kdvi (tdegraphics) -4400 kpaint (tdegraphics) -4500 kghostview (tdegraphics) -4600 kview -4610 kviewviewer -4620 kviewcanvas -4630 kview_plugin -4640 tdeiconedit +4300 kdvi (tdegraphics) +4400 kpaint (tdegraphics) +4500 kghostview (tdegraphics) +4600 kview +4610 kviewviewer +4620 kviewcanvas +4630 kview_plugin +4640 tdeiconedit # tdenetwork -5001 kget -5002 kppp -5003 knode -5004 kdict -5005 knewsticker -5006 kmail -5007 kpf -5008 ksirc -5009 filesharing -5050 libkmime -5051 libkmime (Codecs) -5052 libkmime (Plugin Loader) -5100 libtdenetwork -5150 libkleopatra +5001 kget +5002 kppp +5003 knode +5004 kdict +5005 knewsticker +5006 kmail +5007 kpf +5008 ksirc +5009 filesharing +5050 libkmime +5051 libkmime (Codecs) +5052 libkmime (Plugin Loader) +5100 libtdenetwork +5150 libkleopatra # tdepim -5200 kitchensync -5201 kitchensync (Konnector) -5202 kitchensync (OpieKonnector) -5203 kitchensync (PhoneKonnector) -5204 kitchensync (AgendaKonnector) -5205 kitchensync (CasioKonnector) -5210 kitchensync (KitchenSyncApp) -5220 kitchensync (ManipulatorParts) -5221 kitchensync (overviewpart) -5222 kitchensync (organizerpart) -5223 kitchensync (fileviewpart) -5224 kitchensync Desktop -5225 kitchensync (QtopiaKonnector) -5226 kitchensync Categories -5227 kitchensync Todo -5228 kitchensync AddressBook -5229 kitchensync Datebook -5230 kitchensync SyncEntry -5231 kitchensync SyncUI -5250 kitchensync (Syncing Algorithm) -5300 libtdepim -5310 kprefs -5400 calendarsystem -5500 knotes -5510 kpilot -5511 kpilotdaemon -5512 kpilotconduit -5600 kontact (core) -5601 kontact (interfaces) -5602 kontact (plugins) -5650 tderesources -5700 tdeabc -5710 tdeabc/vcard -5720 kaddressbook -5800 libkcal -5850 korganizer -5855 korganizer (verbose) -5890 korgac -5891 korgac (check) -5900 kalarmd -5901 kalarmd (check) -5950 kalarm -5960 kandy -5970 karm +5200 kitchensync +5201 kitchensync (Konnector) +5202 kitchensync (OpieKonnector) +5203 kitchensync (PhoneKonnector) +5204 kitchensync (AgendaKonnector) +5205 kitchensync (CasioKonnector) +5210 kitchensync (KitchenSyncApp) +5220 kitchensync (ManipulatorParts) +5221 kitchensync (overviewpart) +5222 kitchensync (organizerpart) +5223 kitchensync (fileviewpart) +5224 kitchensync Desktop +5225 kitchensync (QtopiaKonnector) +5226 kitchensync Categories +5227 kitchensync Todo +5228 kitchensync AddressBook +5229 kitchensync Datebook +5230 kitchensync SyncEntry +5231 kitchensync SyncUI +5250 kitchensync (Syncing Algorithm) +5300 libtdepim +5310 kprefs +5400 calendarsystem +5500 knotes +5510 kpilot +5511 kpilotdaemon +5512 kpilotconduit +5600 kontact (core) +5601 kontact (interfaces) +5602 kontact (plugins) +5650 tderesources +5700 tdeabc +5710 tdeabc/vcard +5720 kaddressbook +5800 libkcal +5850 korganizer +5855 korganizer (verbose) +5890 korgac +5891 korgac (check) +5900 kalarmd +5901 kalarmd (check) +5950 kalarm +5960 kandy +5970 karm # libtdehtml -6000 tdehtml -6005 tdehtml (encoding) -6010 tdehtml (dom) -6020 tdehtml (xml) -6030 tdehtml (html) -6031 tdehtml (frames & objects) -6035 tdehtml (parser) -6036 tdehtml (tokenizer) -6040 tdehtml (render) -6041 tdehtml (bidi) -6045 tdehtml (rendering tree) -6050 tdehtml (part) -6060 tdehtml (cache) -6061 tdehtml (cache-expiredates) -6070 tdehtml (jscript) -6080 tdehtml (css) -6090 tdehtml (memory) -6100 kjas -6200 tdehtml (caret) -6201 tdehtml (caret table) -6210 tdehtml (editor) +6000 tdehtml +6005 tdehtml (encoding) +6010 tdehtml (dom) +6020 tdehtml (xml) +6030 tdehtml (html) +6031 tdehtml (frames & objects) +6035 tdehtml (parser) +6036 tdehtml (tokenizer) +6040 tdehtml (render) +6041 tdehtml (bidi) +6045 tdehtml (rendering tree) +6050 tdehtml (part) +6060 tdehtml (cache) +6061 tdehtml (cache-expiredates) +6070 tdehtml (jscript) +6080 tdehtml (css) +6090 tdehtml (memory) +6100 kjas +6200 tdehtml (caret) +6201 tdehtml (caret table) +6210 tdehtml (editor) # libtdeio -7000 tdeio -7001 tdeio (KDirWatch) -7002 tdeio (Slave) -7003 tdeio (KDirLister) -7004 tdeio (KDirListerCache) -7005 tdeio (Filter) -7006 tdeio (Scheduler) -7007 tdeio (TDEIOJob) -7009 tdeio (KMimeType) -7010 tdeio (KRun) -7011 tdeio (KSycoca) -7012 tdeio (KService*) -7013 tdeio (KPing) -7014 tdeio (TDETrader) -7015 tdeio (KAutoMount) -7016 tdeio (TDELauncher) -7017 tdeio (TDEIOConnection) -7018 tdeio (KMimeMagic) -7019 tdeio (tdeioslave) -7020 kded -7021 tdebuildsycoca -7022 kurifilter -7023 kurifilter (plugins) -7024 tdeio (UIServer) -7025 kpac -7026 tdeio (KShred) -7027 tdeio (TCPSlaveBase) -7028 tdeio (Observer) -7029 kssl -7030 tdeio (KEMailSettings) -7031 KImageIO -7032 tdeio (KURLCompletion) -7033 KFileMetaInfo -7034 KFileMetainfo (plugins) -7040 KZip -7041 KTar -7042 KAr -7043 tdeio (bookmarks) - -# 71xx are for tdeioslaves -7101 tdeio_file -7102 tdeio_ftp -7103 tdeio_http -7104 kcookiejar -7105 tdeio_pop3 -7106 tdeio_smb -7107 tdeio_man -7108 tdeio_info -7109 tdeio_tar -7110 tdeio_gzip -7111 tdeio_sql -7112 tdeio_smtp -7113 tdeio_http_debug -7114 tdeio_nntp -7115 tdeio_thumbnail -7116 tdeio_imap -7117 tdeio_audiocd -7118 tdeio_bzip2 -7119 tdeio_help -7120 tdeio_sftp -7121 tdeio_nfs -7122 tdeio_sieve -7123 tdeio_kamera -7124 tdeio_cgi -7125 tdeio_ldap -7126 tdeio_devices -7127 tdeio_fish -7128 tdeio_svn -7131 tdeio_xz +7000 tdeio +7001 tdeio (KDirWatch) +7002 tdeio (Slave) +7003 tdeio (KDirLister) +7004 tdeio (KDirListerCache) +7005 tdeio (Filter) +7006 tdeio (Scheduler) +7007 tdeio (TDEIOJob) +7009 tdeio (KMimeType) +7010 tdeio (KRun) +7011 tdeio (KSycoca) +7012 tdeio (KService*) +7013 tdeio (KPing) +7014 tdeio (TDETrader) +7015 tdeio (KAutoMount) +7016 tdeio (TDELauncher) +7017 tdeio (TDEIOConnection) +7018 tdeio (KMimeMagic) +7019 tdeio (tdeioslave) +7020 kded +7021 tdebuildsycoca +7022 kurifilter +7023 kurifilter (plugins) +7024 tdeio (UIServer) +7025 kpac +7026 tdeio (KShred) +7027 tdeio (TCPSlaveBase) +7028 tdeio (Observer) +7029 kssl +7030 tdeio (KEMailSettings) +7031 KImageIO +7032 tdeio (KURLCompletion) +7033 KFileMetaInfo +7034 KFileMetainfo (plugins) +7040 KZip +7041 KTar +7042 KAr +7043 tdeio (bookmarks) + +# 71xx are for tdeioslaves +7101 tdeio_file +7102 tdeio_ftp +7103 tdeio_http +7104 kcookiejar +7105 tdeio_pop3 +7106 tdeio_smb +7107 tdeio_man +7108 tdeio_info +7109 tdeio_tar +7110 tdeio_gzip +7111 tdeio_sql +7112 tdeio_smtp +7113 tdeio_http_debug +7114 tdeio_nntp +7115 tdeio_thumbnail +7116 tdeio_imap +7117 tdeio_audiocd +7118 tdeio_bzip2 +7119 tdeio_help +7120 tdeio_sftp +7121 tdeio_nfs +7122 tdeio_sieve +7123 tdeio_kamera +7124 tdeio_cgi +7125 tdeio_ldap +7126 tdeio_devices +7127 tdeio_fish +7128 tdeio_svn +7129 tdeio_appinfo +7130 tdeio_apt +7131 tdeio_xz +7132 tdeio_ftps +7133 tdeio_gopher +7134 tdeio_locate +7135 tdeio_sword +7136 tdeio_umountwrapper # tdesdk -8100 kompare -8101 kompare (libs) -8102 kompare (shell) -8103 kompare (part) -8104 kompare (list view) -8105 kompare (nav view) -8106 kompare (connect widget) -8107 kbabel -8108 kbabel (search) -8109 catalogmanager -8050 cervisia -8051 cervisia (cvsservice) +8100 kompare +8101 kompare (libs) +8102 kompare (shell) +8103 kompare (part) +8104 kompare (list view) +8105 kompare (nav view) +8106 kompare (connect widget) +8107 kbabel +8108 kbabel (search) +8109 catalogmanager +8050 cervisia +8051 cervisia (cvsservice) # tdevelop -9000 tdevelop (core) -9001 tdevelop (grep view) -9002 tdevelop (doc tree view) -9003 tdevelop (class view) -9004 tdevelop (output views) -9005 tdevelop (class store) -9006 tdevelop (cvs interface) -9007 tdevelop (cpp support) -9008 tdevelop (gcc options) -9009 tdevelop (astyle) -9010 tdevelop (appwizard) -9011 tdevelop (python scripting) -9012 tdevelop (debugger) -9013 tdevelop (java support) -9014 tdevelop (python support) -9015 tdevelop (script project) -9016 tdevelop (perl support) -9017 tdevelop (file view) -9018 tdevelop (php support) -9019 tdevelop (fortran support) -9020 tdevelop (auto project) -9021 tdevelop (pgi options) -9022 tdevelop (ctags) -9023 tdevelop (regexptest) -9024 tdevelop (trollproject) -9025 tdevelop (customproject) -9026 tdevelop (doxygen) -9027 tdevelop (cvs) -9028 tdevelop (abbrev) -9029 tdevelop (filter) -9030 tdevelop (texttools) -9031 tdevelop (history) -9032 qeditor -9033 tdevelop (diff frontend) -9034 tdevelop (filecreate part) -9035 tdevelop (konsole part) -9036 tdevelop (subversion part) +9000 tdevelop (core) +9001 tdevelop (grep view) +9002 tdevelop (doc tree view) +9003 tdevelop (class view) +9004 tdevelop (output views) +9005 tdevelop (class store) +9006 tdevelop (cvs interface) +9007 tdevelop (cpp support) +9008 tdevelop (gcc options) +9009 tdevelop (astyle) +9010 tdevelop (appwizard) +9011 tdevelop (python scripting) +9012 tdevelop (debugger) +9013 tdevelop (java support) +9014 tdevelop (python support) +9015 tdevelop (script project) +9016 tdevelop (perl support) +9017 tdevelop (file view) +9018 tdevelop (php support) +9019 tdevelop (fortran support) +9020 tdevelop (auto project) +9021 tdevelop (pgi options) +9022 tdevelop (ctags) +9023 tdevelop (regexptest) +9024 tdevelop (trollproject) +9025 tdevelop (customproject) +9026 tdevelop (doxygen) +9027 tdevelop (cvs) +9028 tdevelop (abbrev) +9029 tdevelop (filter) +9030 tdevelop (texttools) +9031 tdevelop (history) +9032 qeditor +9033 tdevelop (diff frontend) +9034 tdevelop (filecreate part) +9035 tdevelop (konsole part) +9036 tdevelop (subversion part) # toys and games 10000 amor @@ -367,59 +374,59 @@ # Kate/Kant/KWrite -13000 Kate -13001 Kate (App) -13002 Kate (View Manager) -13010 Kate (XML/Syntax) -13020 Kate (Document) -13025 Kate (Commands) -13030 Kate (View) -13033 Kate (Renderer) -13035 Kate (Code Completion) -13040 Kate (Plugins) -13050 Kate (Scripting) -13051 Kate (KJS Scripts) +13000 Kate +13001 Kate (App) +13002 Kate (View Manager) +13010 Kate (XML/Syntax) +13020 Kate (Document) +13025 Kate (Commands) +13030 Kate (View) +13033 Kate (Renderer) +13035 Kate (Code Completion) +13040 Kate (Plugins) +13050 Kate (Scripting) +13051 Kate (KJS Scripts) # Kopete -14000 kopete -14010 libkopete -14100 kopete (gadu) -14101 kopete (gadu - raw protocol) -14110 kopete (icq) -14111 kopete (icq - raw protocol) -14120 kopete (irc) -14121 kopete (irc - raw protocol) -14130 kopete (jabber) -14131 kopete (jabber - raw protocol) -14140 kopete (msn) -14141 kopete (msn - raw protocol) -14150 kopete (oscar) -14151 kopete (oscar - raw protocol) -14152 kopete (oscar/aim) -14153 kopete (oscar/icq) -14160 kopete (sms) -14161 kopete (sms - raw protocol) -14170 kopete (winpopup) -14171 kopete (winpopup - raw protocol) -14180 kopete (yahoo) -14181 kopete (yahoo - raw protocol) -14190 kopete (groupwise) -14191 kopete (libgroupwise) -14192 kopete (libgroupwise - raw) -14200 kopete (meanwhile) -14300 kopete (autoaway) -14301 kopete (connectionstatus) -14302 kopete (contactnotes) -14303 kopete (cryptography) -14304 kopete (importer) -14305 kopete (motionautoaway) -14306 kopete (msginfo) -14307 kopete (nowlistening) -14308 kopete (translator) -14309 kopete (webpresence) -14310 kopete (history) -14311 kopete (skype) -14312 kopete (smpppdcs) +14000 kopete +14010 libkopete +14100 kopete (gadu) +14101 kopete (gadu - raw protocol) +14110 kopete (icq) +14111 kopete (icq - raw protocol) +14120 kopete (irc) +14121 kopete (irc - raw protocol) +14130 kopete (jabber) +14131 kopete (jabber - raw protocol) +14140 kopete (msn) +14141 kopete (msn - raw protocol) +14150 kopete (oscar) +14151 kopete (oscar - raw protocol) +14152 kopete (oscar/aim) +14153 kopete (oscar/icq) +14160 kopete (sms) +14161 kopete (sms - raw protocol) +14170 kopete (winpopup) +14171 kopete (winpopup - raw protocol) +14180 kopete (yahoo) +14181 kopete (yahoo - raw protocol) +14190 kopete (groupwise) +14191 kopete (libgroupwise) +14192 kopete (libgroupwise - raw) +14200 kopete (meanwhile) +14300 kopete (autoaway) +14301 kopete (connectionstatus) +14302 kopete (contactnotes) +14303 kopete (cryptography) +14304 kopete (importer) +14305 kopete (motionautoaway) +14306 kopete (msginfo) +14307 kopete (nowlistening) +14308 kopete (translator) +14309 kopete (webpresence) +14310 kopete (history) +14311 kopete (skype) +14312 kopete (smpppdcs) # KDB 20000 KDB (core) @@ -429,15 +436,15 @@ 20012 KDB (plugin) #tdefilereplace -23000 TDEFileReplace (tdefilereplacepart) +23000 TDEFileReplace (tdefilereplacepart) #klinkstatus 23100 KLinkStatus # Quanta 24000 Quanta -24001 Quanta (parser) -24002 Quanta (debugger) +24001 Quanta (parser) +24002 Quanta (debugger) # kafka 25000 Kafka (kafkapp) @@ -448,25 +455,25 @@ 25005 Kafka (kafkadom) # KSVG -26000 KSVG -26001 KSVG - Parser -26002 KSVG - Rendering -26003 KSVG - KPart -26004 KSVG - Ecma -26005 KSVG - Canvas - -26500 KDOM XInclude -26550 KDOM XPointer -26560 KDOM XPath -26600 KDOM Catalog -26650 KDOM kxmllint +26000 KSVG +26001 KSVG - Parser +26002 KSVG - Rendering +26003 KSVG - KPart +26004 KSVG - Ecma +26005 KSVG - Canvas + +26500 KDOM XInclude +26550 KDOM XPointer +26560 KDOM XPath +26600 KDOM Catalog +26650 KDOM kxmllint # XSLT on top of KDOM -27000 KXSLT +27000 KXSLT # libkscan / kooka -28000 Kooka -29000 libkscan +28000 Kooka +29000 libkscan # 30001-40000 are for KOffice 30001 koffice (lib koml) @@ -522,7 +529,7 @@ 39001 kformula 40000 kformula 41000 chalk (tiles) -41001 chalk (core) +41001 chalk (core) 41002 chalk (registry) 41003 chalk (tools) 41004 chalk (color management system) @@ -542,43 +549,43 @@ 44021 Kexi (plugins) # kdeextragear -50001 kfortune +50001 kfortune # KIPI - KDE Imaging Plugin Interface -51000 KIPI (general) -51001 KIPI (loading) +51000 KIPI (general) +51001 KIPI (loading) # tdemultimedia -60001 kreatecd -60002 kaudiocreator -60005 krec -60010 libkcddb -65432 juk -66666 noatun -67000 kscd -67100 kmix -67200 tdemid +60001 kreatecd +60002 kaudiocreator +60005 krec +60010 libkcddb +65432 juk +66666 noatun +67000 kscd +67100 kmix +67200 tdemid # tdebindings -70001 dcoppython -80001 kjsembed +70001 dcoppython +80001 kjsembed # tdeaddons -90000 vimpart -90010 noatun-plugins (dub) -90020 noatun-plugins (lyrics) -90100 konq-plugins (fsview) -90110 konq-plugins (webarchiver) -90120 konq-plugins (validators) -90130 konq-plugins (uachanger) -90140 konq-plugins (sidebar - newsticker) -90150 konq-plugins (minitools) -90160 konq-plugins (kuick) -90170 konq-plugins (kimgalleryplugin) -90180 konq-plugins (domtreeviewer) -90190 konq-plugins (dirfilter) -90200 kicker-applets (mediacontrol) -90210 konq-plugins (rellinks) +90000 vimpart +90010 noatun-plugins (dub) +90020 noatun-plugins (lyrics) +90100 konq-plugins (fsview) +90110 konq-plugins (webarchiver) +90120 konq-plugins (validators) +90130 konq-plugins (uachanger) +90140 konq-plugins (sidebar - newsticker) +90150 konq-plugins (minitools) +90160 konq-plugins (kuick) +90170 konq-plugins (kimgalleryplugin) +90180 konq-plugins (domtreeviewer) +90190 konq-plugins (dirfilter) +90200 kicker-applets (mediacontrol) +90210 konq-plugins (rellinks) # kdenonbeta diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index d906f67fc..18af9c030 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -28,8 +28,8 @@ #include "tdeapplication.h" #include "tdeglobal.h" -#include "kinstance.h" -#include "kstandarddirs.h" +#include "tdeinstance.h" +#include "tdestandarddirs.h" #include <tqmessagebox.h> #include <tdelocale.h> @@ -59,7 +59,11 @@ #include <config.h> #ifdef HAVE_BACKTRACE -#include <execinfo.h> +#include BACKTRACE_H + +#ifdef HAVE_DLFCN_H +#include <dlfcn.h> +#endif #ifdef HAVE_ABI_CXA_DEMANGLE #include <cxxabi.h> @@ -285,24 +289,26 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char // If the application doesn't have a TQApplication object it can't use // a messagebox, as well as in case of GUI is disabled. - if ( nOutput == 1 && ( !kapp || !kapp->guiEnabled()) ) { + if ( nOutput == 1 && ( !tdeApp || !tdeApp->guiEnabled()) ) { nOutput = 2; } else if ( nOutput == 4 && nLevel != KDEBUG_FATAL ) { return; } - const int BUFSIZE = 4096; - char buf[BUFSIZE]; - if ( !kDebug_data->aAreaName.isEmpty() ) { - strlcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] [").ascii(), BUFSIZE ); - strlcat( buf, kDebug_data->aAreaName.data(), BUFSIZE ); - strlcat( buf, "] ", BUFSIZE ); - strlcat( buf, data, BUFSIZE ); - } - else { - strlcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii(), BUFSIZE ); - strlcat( buf, data, BUFSIZE ); + const int BUF_SIZE = 4096; + const int BUF_PID_SIZE = 20; + char buf[BUF_SIZE]; + char buf_pid[BUF_PID_SIZE]; + strlcpy(buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii(), BUF_SIZE); + if (!kDebug_data->aAreaName.isEmpty()) + { + strlcat( buf, "[", BUF_SIZE ); + strlcat( buf, kDebug_data->aAreaName.data(), BUF_SIZE ); + strlcat( buf, "] ", BUF_SIZE ); } + snprintf(buf_pid, BUF_PID_SIZE, "[%d] ", getpid()); + strlcat(buf, buf_pid, BUF_SIZE); + strlcat(buf, data, BUF_SIZE); // Output switch( nOutput ) @@ -327,7 +333,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char break; } TQFile aOutputFile( kDebug_data->config->readPathEntry(aKey, "kdebug.dbg") ); - aOutputFile.open( (TQIODevice_OpenModeFlag)((int)IO_WriteOnly | (int)IO_Append | (int)IO_Raw) ); + aOutputFile.open( IO_WriteOnly | IO_Append | IO_Raw ); aOutputFile.writeBlock( buf, strlen( buf ) ); aOutputFile.close(); break; @@ -337,7 +343,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char // Since we are in tdecore here, we cannot use KMsgBox and use // TQMessageBox instead if ( !kDebug_data->aAreaName.isEmpty() ) - aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) ); + aCaption += TQString("(%1)").arg( TQString(kDebug_data->aAreaName) ); TQMessageBox::warning( 0L, aCaption, data, i18n("&OK") ); break; } @@ -426,7 +432,7 @@ kdbgstream& kdbgstream::operator<< (TQChar ch) output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0'); else { output += ch; - if (ch == QChar('\n')) flush(); + if (ch == TQChar('\n')) flush(); } return *this; } @@ -465,7 +471,7 @@ kdbgstream& kdbgstream::operator<< (const TQWidget* widget) return *this; } output += string; - if (output.at(output.length() -1 ) == QChar('\n')) + if (output.at(output.length() -1 ) == TQChar('\n')) { flush(); } @@ -620,7 +626,7 @@ asymbol** bfdLoadSymtab (bfd *abfd) { long symCount; // count of entries in symbol table long symtab_sz; // size of the table asymbol** rv; - bfd_boolean dynamic = FALSE; + bool dynamic = false; // make shure the file has symbol table if ((bfd_get_file_flags (abfd) & HAS_SYMS) == 0){ @@ -631,7 +637,7 @@ asymbol** bfdLoadSymtab (bfd *abfd) { symtab_sz = bfd_get_symtab_upper_bound (abfd); if (symtab_sz == 0) { symtab_sz = bfd_get_dynamic_symtab_upper_bound (abfd); - dynamic = TRUE; + dynamic = true; } if (symtab_sz < 0) { return 0; @@ -687,10 +693,15 @@ void bfdFillAdditionalFunctionsInfo(BacktraceFunctionInfo &func) { // found source file and line for given address for (asection *sect = abfd->sections; sect != NULL; sect = sect->next) { - +#ifdef HAVE_LIBBFD_2_34_API + if (bfd_section_flags(sect) & SEC_ALLOC) { + bfd_vma sectStart = bfd_section_vma(sect); + bfd_vma sectEnd = sectStart + bfd_section_size(sect); +#else // HAVE_LIBBFD_2_34_API if (bfd_get_section_flags(abfd, sect) & SEC_ALLOC) { bfd_vma sectStart = bfd_get_section_vma(abfd, sect); bfd_vma sectEnd = sectStart + bfd_section_size(abfd, sect); +#endif // HAVE_LIBBFD_2_34_API if (sectStart <= func.offset && func.offset < sectEnd) { bfd_vma sectOffset = func.offset - sectStart; const char* functionName; @@ -753,7 +764,13 @@ TQString formatBacktrace(void *addr) { // NOTE: if somebody would compile for some non-linux-glibc platform // check if dladdr function is avalible there Dl_info info; - dladdr(func.addr, &info); // obtain information about the function. + + // obtain information about the function. +#ifdef Q_OS_SOLARIS + dladdr((void *)func.addr, &info); +#else + dladdr(func.addr, &info); +#endif /* Solaris */ func.fileName = info.dli_fname; func.base = info.dli_fbase; @@ -810,7 +827,7 @@ TQString kdBacktrace(int levels) if (levels) { for (int i = 0; i < levels; ++i) { - rv += QString().sprintf("#%-2d ", i); + rv += TQString().sprintf("#%-2d ", i); rv += formatBacktrace(trace[i]); rv += '\n'; } diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index b9a6efb10..f78464287 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -222,12 +222,7 @@ KExtendedSocket::~KExtendedSocket() delete d; } -#ifdef USE_QT3 void KExtendedSocket::reset() -#endif // USE_QT3 -#ifdef USE_QT4 -bool KExtendedSocket::reset() -#endif // USE_QT4 { closeNow(); release(); @@ -644,7 +639,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnIn == NULL) { d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnIn->setEnabled(true); } @@ -692,7 +687,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // if the class is being created now, there's nothing to write yet // so socketActivityWrite() will get called once and disable // the notifier @@ -707,7 +702,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->emitWrite && d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); } return true; @@ -788,8 +783,8 @@ int KExtendedSocket::startAsyncLookup() d->resRemote.setFlags(flags); d->resRemote.setFamily(familyMask); d->resRemote.setSocketType(socktype); - TQObject::connect(&d->resRemote, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resRemote, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resRemote.start()) { @@ -805,8 +800,8 @@ int KExtendedSocket::startAsyncLookup() d->resLocal.setFlags(flags); d->resLocal.setFamily(familyMask); d->resLocal.setSocketType(socktype); - TQObject::connect(&d->resLocal, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resLocal, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resLocal.start()) { @@ -901,7 +896,7 @@ int KExtendedSocket::listen(int N) { d->status = listening; d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); } return retval == -1 ? -1 : 0; } @@ -1223,7 +1218,7 @@ int KExtendedSocket::startAsyncConnect() // signal lookupFinished to do connection if (d->status < lookupDone) { - TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status < lookupInProgress) return startAsyncLookup(); else @@ -1233,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect() // here we have d->status >= lookupDone and <= connecting // we can do our connection d->status = connecting; - TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this); + TQGuardedPtr<TQObject> p = this; connectionEvent(); if (!p) return -1; // We have been deleted. @@ -1262,7 +1257,7 @@ void KExtendedSocket::cancelAsyncConnect() d->status = lookupDone; } -bool KExtendedSocket::open(TQ_OpenMode mode) +bool KExtendedSocket::open(int mode) { if (mode != IO_Raw | IO_ReadWrite) return false; // invalid open mode @@ -1436,7 +1431,7 @@ void KExtendedSocket::flush() } -TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen) { cleanError(); if (d->status < connected || d->flags & passiveSocket) @@ -1481,7 +1476,7 @@ TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len) { cleanError(); if (d->status < connected || d->status >= closing || d->flags & passiveSocket) @@ -1557,12 +1552,7 @@ int KExtendedSocket::unreadBlock(const char *, uint) return -1; } -#ifdef USE_QT3 int KExtendedSocket::bytesAvailable() const -#endif // USE_QT3 -#ifdef USE_QT4 -qint64 KExtendedSocket::bytesAvailable() const -#endif // USE_QT4 { if (d->status < connected || d->flags & passiveSocket) return -2; @@ -1606,7 +1596,7 @@ int KExtendedSocket::getch() { unsigned char c; int retval; - retval = tqreadBlock((char*)&c, sizeof(c)); + retval = readBlock((char*)&c, sizeof(c)); if (retval < 0) return retval; @@ -1616,7 +1606,7 @@ int KExtendedSocket::getch() int KExtendedSocket::putch(int ch) { unsigned char c = (char)ch; - return tqwriteBlock((char*)&c, sizeof(c)); + return writeBlock((char*)&c, sizeof(c)); } // sets the emission of the readyRead signal @@ -1919,9 +1909,9 @@ void KExtendedSocket::connectionEvent() // error here is either EWOULDBLOCK or EINPROGRESS // so, it is a good condition d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // ok, let the Qt event loop do the selecting for us return; @@ -1979,7 +1969,7 @@ void KExtendedSocket::dnsResultsReady() void KExtendedSocket::startAsyncConnectSlot() { - TQObject::disconnect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::disconnect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status == lookupDone) startAsyncConnect(); diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index fad502c04..3b3018b59 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -22,10 +22,6 @@ #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX #include <sys/time.h> @@ -44,10 +40,10 @@ class KAddressInfo; /* our abstraction of it */ class TQSocketNotifier; /* - * This is extending QIODevice's error codes + * This is extending TQIODevice's error codes * * According to tqiodevice.h, the last error is IO_UnspecifiedError - * These errors will never occur in functions declared in QIODevice + * These errors will never occur in functions declared in TQIODevice * (except open, but you shouldn't call open) */ #define IO_ListenError (IO_UnspecifiedError+1) @@ -67,7 +63,7 @@ class KExtendedSocketPrivate; * only difference is that the passiveSocket flag must be passed either to * the constructor or to setSocketFlags(). If passiveSocket is used, the class will * enable functions listen() and accept() and related signals, and will - * also disable tqreadBlock() and tqwriteBlock(). + * also disable readBlock() and writeBlock(). * * To create a Unix socket, one would pass flag unixSocket to the constructor * or setSocketFlags(). The hostname and service/port can be set to whatever is @@ -92,9 +88,9 @@ class KExtendedSocketPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short an extended socket */ -class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice +class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public TQIODevice { - Q_OBJECT + TQ_OBJECT public: @@ -211,12 +207,7 @@ public: * freeing any related resources still being kept. * @since 3.1 */ -#ifdef USE_QT3 void reset(); -#endif // USE_QT3 -#ifdef USE_QT4 - bool reset(); -#endif // USE_QT4 /* * --- status, flags and internal variables --- * @@ -627,7 +618,7 @@ public: * @return true if successful, false when an error occurred or the most was * not correct */ - virtual bool open(TQ_OpenMode mode = (TQ_OpenMode)(IO_Raw | IO_ReadWrite)); + virtual bool open(int mode = (int)(IO_Raw | IO_ReadWrite)); /** * Closes the socket. If we have data still in the write buffer yet to be @@ -677,7 +668,7 @@ public: * ready to receive data, it will block, unless this is a non-blocking socket. * * This function does not touch the read buffer. You can empty it by calling - * tqreadBlock() with a null destination buffer. + * readBlock() with a null destination buffer. */ virtual void flush(); @@ -685,12 +676,7 @@ public: * Returns length of this socket. This call is not supported on sockets. * @return the length of this socket, or 0 if unsupported */ -#ifdef USE_QT3 virtual inline TQ_ULONG size() const -#endif // USE_QT3 -#ifdef USE_QT4 - virtual inline qint64 size() const -#endif // USE_QT4 { return 0; } /** @@ -745,7 +731,7 @@ public: * This function returns 0, if the function detected end-of-file condition * (socket was closed) */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Writes a block of data to the socket. @@ -770,7 +756,7 @@ public: * The return value might be less than @p len if the output buffers cannot * accommodate that many bytes and -1 in the case of an errro. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Peeks at a block of data from the socket. @@ -805,12 +791,7 @@ public: * @return The number of available bytes, or -1 on error or -2 if this call is invalid * in the current state. */ -#ifdef USE_QT3 virtual int bytesAvailable() const; -#endif // USE_QT3 -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif // USE_QT4 /** * Waits @p msec milliseconds for more data to be available (use 0 to @@ -950,7 +931,7 @@ public: * @param flags the same flags as getnameinfo() * @returns 0 on success, nonzero otherwise. */ - static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; + static int resolve(sockaddr* sock, ksocklen_t len, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED; /** * Performs resolution on the given socket address. @@ -964,7 +945,7 @@ public: * @param flags the same flags as getnameinfo() * @returns 0 on success, nonzero otherwise. */ - static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED; + static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) TDE_DEPRECATED; /** @deprecated * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve. @@ -986,7 +967,7 @@ public: * @param error pointer to a variable holding the error code * @return a list of KAddressInfos */ - static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) KDE_DEPRECATED; + static TQPtrList<KAddressInfo> lookup(const TQString& host, const TQString& port, int flags = 0, int *error = 0) TDE_DEPRECATED; /** * Returns the local socket address @@ -994,7 +975,7 @@ public: * @param fd the file descriptor * @return the local socket address or 0 if an error occurred. Delete after use. */ - static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *localAddress(int fd) TDE_DEPRECATED; /** * Returns the peer socket address. Use KExtendedSocket::resolve() to @@ -1003,7 +984,7 @@ public: * @param fd the file descriptor * @return the peer socket address or 0 if an error occurred. Delete after use. */ - static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED; + static ::TDESocketAddress *peerAddress(int fd) TDE_DEPRECATED; /** * Returns the representing text of this error code @@ -1022,7 +1003,7 @@ public: * @param enable if true, set address reusable * @return true on success, false on failure. */ - static bool setAddressReusable(int fd, bool enable) KDE_DEPRECATED; + static bool setAddressReusable(int fd, bool enable) TDE_DEPRECATED; protected: virtual void virtual_hook( int id, void* data ); @@ -1059,20 +1040,20 @@ public: * Returns the KAddressInfo's TDESocketAddress. * Only valid as long as the KAddressInfo exists. */ - inline KDE_DEPRECATED operator const ::TDESocketAddress*() const + inline TDE_DEPRECATED operator const ::TDESocketAddress*() const { return addr; } /** * Returns the KAddressInfo's addrinfo. */ - inline KDE_DEPRECATED operator const addrinfo&() const + inline TDE_DEPRECATED operator const addrinfo&() const { return *ai; } /** * Returns a pointer to KAddressInfo's addrinfo. * Only valid as long as the KAddressInfo exists. */ - inline KDE_DEPRECATED operator const addrinfo*() const + inline TDE_DEPRECATED operator const addrinfo*() const { return ai; } /** @@ -1080,32 +1061,32 @@ public: * Only valid as long as the KAddressInfo exists. * @return the KAddressInfo's TDESocketAddress. */ - inline KDE_DEPRECATED const ::TDESocketAddress* address() const + inline TDE_DEPRECATED const ::TDESocketAddress* address() const { return addr; } /** * Returns the flags of the address info (see getaddrinfo(3)). * @return the flags of the addres info. */ - int flags() const KDE_DEPRECATED; + int flags() const TDE_DEPRECATED; /** * Returns the family of the address info (see getaddrinfo(3)). * @return the family of the addres info. */ - int family() const KDE_DEPRECATED; + int family() const TDE_DEPRECATED; /** * Returns the socket type of the address info (see getaddrinfo(3)). * @return the socket type of the addres info. */ - int socktype() const KDE_DEPRECATED; + int socktype() const TDE_DEPRECATED; /** * Returns the protocol of the address info (see getaddrinfo(3)). * @return the protocol of the addres info. */ - int protocol() const KDE_DEPRECATED; + int protocol() const TDE_DEPRECATED; /** @@ -1113,7 +1094,7 @@ public: * Only valid as long as the KAddressInfo exists. * @return the official name of the host */ - const char* canonname() const KDE_DEPRECATED; + const char* canonname() const TDE_DEPRECATED; /** * Returns the length of the TDESocketAddress. diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h index 7f2b7b453..1ed1b41ee 100644 --- a/tdecore/kgenericfactory.h +++ b/tdecore/kgenericfactory.h @@ -21,7 +21,7 @@ #include <klibloader.h> #include <ktypelist.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kgenericfactory.tcc> #include <tdeglobal.h> #include <tdelocale.h> @@ -190,8 +190,8 @@ protected: const char *className, const TQStringList &args ) { KGenericFactoryBase<Product>::initializeMessageCatalogue(); - return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType> - ::create( 0, 0, parent, name, className, args ))); + return (KDEPrivate::ConcreteFactory<Product, ParentType> + ::create( 0, 0, parent, name, className, args )); } }; @@ -388,10 +388,4 @@ protected: } }; - -/* - * vim: et sw=4 - */ - #endif - diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc index 330af8aa2..dda6ec487 100644 --- a/tdecore/kgenericfactory.tcc +++ b/tdecore/kgenericfactory.tcc @@ -22,7 +22,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -// -*- mode: c++ -*- // // W A R N I N G // ------------- @@ -151,7 +150,7 @@ namespace KDEPrivate const TQStringList &args, Type2Type<TQWidget> ) { - WidgetParentType *p = dynamic_cast<WidgetParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -161,7 +160,7 @@ namespace KDEPrivate TQObject *parent, const char *name, const TQStringList &args, Type2Type<TQObject> ) { - ParentType *p = dynamic_cast<ParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + ParentType *p = dynamic_cast<ParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -180,9 +179,9 @@ namespace KDEPrivate const char *className, const TQStringList &args ) { - return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, - parent, name, className, - args ))); + return static_cast<TQObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, + parent, name, className, + args )); } }; @@ -266,7 +265,3 @@ namespace KDEPrivate } #endif - -/* - * vim: et sw=4 - */ diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 675731401..cd6b9bad7 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * $Id$ * * This file is part of the KDE project, module tdecore. @@ -35,7 +35,7 @@ #include <kicontheme.h> #include "kiconeffect.h" -#if defined(Q_WS_WIN) || defined(Q_WS_MACX) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX) static bool tqt_use_xrender=true; static bool tqt_has_xft=true; #else @@ -287,7 +287,7 @@ void TDEIconEffect::toGray(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; for (i=0; i<pixels; i++) { @@ -309,7 +309,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; float rcol = col.red(), gcol = col.green(), bcol = col.blue(); for (i=0; i<pixels; i++) @@ -348,7 +348,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) void TDEIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) { int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, alpha, i; int rw = white.red(), gw = white.green(), bw = white.blue(); int rb = black.red(), gb = black.green(), bb = black.blue(); @@ -400,7 +400,7 @@ void TDEIconEffect::deSaturate(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int h, s, v, i; for (i=0; i<pixels; i++) @@ -418,7 +418,7 @@ void TDEIconEffect::toGamma(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int i, rval, gval, bval; float gamma; @@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img) else for (y=0; y<height; y++) { - QRgb *line = (QRgb *) img.scanLine(y); + TQRgb *line = (TQRgb *) img.scanLine(y); for (x=(y%2); x<width; x+=2) line[x] &= 0x00ffffff; } @@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix) for (int y=0; y<img.height(); y++) { - QRgb *line = (QRgb *) img.scanLine(y); - QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; + TQRgb *line = (TQRgb *) img.scanLine(y); + TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; for (int x=0; x<(img.width()+31)/32; x++) line[x] &= pattern; } @@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const int x, y; if (src.depth() == 32) { - QRgb *l1, *l2; + TQRgb *l1, *l2; for (y=0; y<h; y++) { - l1 = (QRgb *) src.scanLine(y); - l2 = (QRgb *) dst.scanLine(y*2); + l1 = (TQRgb *) src.scanLine(y); + l2 = (TQRgb *) dst.scanLine(y*2); for (x=0; x<w; x++) { l2[x*2] = l2[x*2+1] = l1[x]; @@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay) if (src.depth() == 32) { - QRgb *oline, *sline; + TQRgb *oline, *sline; int r1, g1, b1, a1; int r2, g2, b2, a2; for (i=0; i<src.height(); i++) { - oline = (QRgb *) overlay.scanLine(i); - sline = (QRgb *) src.scanLine(i); + oline = (TQRgb *) overlay.scanLine(i); + sline = (TQRgb *) src.scanLine(i); for (j=0; j<src.width(); j++) { @@ -743,7 +743,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); // Use NotROP to avoid having to repaint the pixmap each time. - p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::black, 2, TQt::DotLine)); p.setRasterOp(TQt::NotROP); // The spacing between the rects we draw. @@ -846,13 +846,13 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) if ((widget->rect().width() <= maxRect.width()) || (widget->rect().height() <= maxRect.height())) { -// p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE); // WARNING: This was done in Qt3. It only worked in this placement due to a glitch in Qt3; it has therefore been moved below grabWidget, where it should have been in the first place. +// p = new TQPainter(TQApplication::desktop()->screen( -1 ), true); // WARNING: This was done in Qt3. It only worked in this placement due to a glitch in Qt3; it has therefore been moved below grabWidget, where it should have been in the first place. pix = TQPixmap::grabWindow((TQApplication::desktop()->screen( -1 ))->winId(), maxRect.x(), maxRect.y(), maxRect.width(), maxRect.height()); - p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE); + p = new TQPainter(TQApplication::desktop()->screen( -1 ), true); } else { // not as ugly as drawing directly to the screen diff --git a/tdecore/kiconeffect.h b/tdecore/kiconeffect.h index 06deb0d4c..0431e50bf 100644 --- a/tdecore/kiconeffect.h +++ b/tdecore/kiconeffect.h @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 4d787c303..b1ee62efd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * $Id$ * @@ -29,11 +29,11 @@ #include <tdeapplication.h> #include <kipc.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kinstance.h> +#include <tdesimpleconfig.h> +#include <tdeinstance.h> #include <kicontheme.h> #include <kiconloader.h> @@ -155,9 +155,9 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs) d->imgDict.setAutoDelete(true); d->links.setAutoDelete(true); - if (kapp) { - kapp->addKipcEventMask(KIPC::IconChanged); - TQObject::connect(kapp, TQT_SIGNAL(updateIconLoaders()), d, TQT_SLOT(reconfigure())); + if (tdeApp) { + tdeApp->addKipcEventMask(KIPC::IconChanged); + TQObject::connect(tdeApp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure())); } init( _appname, _dirs ); @@ -812,7 +812,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in *img = img->convertDepth(32); for (int y = 0; y < img->height(); y++) { - QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y)); + TQRgb *line = reinterpret_cast<TQRgb *>(img->scanLine(y)); for (int x = 0; x < img->width(); x++) line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24); } @@ -851,8 +851,8 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in line < favIcon.height(); ++line ) { - QRgb* fpos = reinterpret_cast< QRgb* >( favIcon.scanLine( line )); - QRgb* ipos = reinterpret_cast< QRgb* >( img->scanLine( line + y )) + x; + TQRgb* fpos = reinterpret_cast< TQRgb* >( favIcon.scanLine( line )); + TQRgb* ipos = reinterpret_cast< TQRgb* >( img->scanLine( line + y )) + x; for( int i = 0; i < favIcon.width(); ++i, ++fpos, ++ipos ) diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h index 434a3d976..3876efc02 100644 --- a/tdecore/kiconloader.h +++ b/tdecore/kiconloader.h @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> @@ -28,7 +28,7 @@ #endif #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kicontheme.h> struct TDEIconGroup; diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h index 82ff9dbe8..dacf40ade 100644 --- a/tdecore/kiconloader_p.h +++ b/tdecore/kiconloader_p.h @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> @@ -35,7 +35,7 @@ public: class TDEIconLoaderPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQStringList mThemesInTree; TDEIconGroup *mpGroups; diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index 4b9306142..15bad692a 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * $Id$ * @@ -29,11 +29,11 @@ #include <tqdir.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kinstance.h> +#include <tdesimpleconfig.h> +#include <tdeinstance.h> #include "kicontheme.h" @@ -136,11 +136,11 @@ TDEIconTheme::TDEIconTheme(const TQString& name, const TQString& appName) fileName = mDir + "index.theme"; mainSection="Icon Theme"; } - // Use TDESharedConfig to avoid parsing the file many times, from each kinstance. + // Use TDESharedConfig to avoid parsing the file many times, from each TDEInstance. // Need to keep a ref to it to make this useful d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ ); TDEConfig& cfg = *d->sharedConfig; - //was: KSimpleConfig cfg(fileName); + //was: TDESimpleConfig cfg(fileName); cfg.setGroup(mainSection); mName = cfg.readEntry("Name"); diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h index 9079eff0c..bff1bf4e5 100644 --- a/tdecore/kicontheme.h +++ b/tdecore/kicontheme.h @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdecore. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp index ca41fecdf..e8df061ec 100644 --- a/tdecore/kidna.cpp +++ b/tdecore/kidna.cpp @@ -21,18 +21,18 @@ #include "kidna.h" -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported #include "kresolver.h" #endif #include <kdebug.h> -#ifndef Q_WS_WIN //TODO knetwork not ported +#ifndef TQ_WS_WIN //TODO knetwork not ported using namespace KNetwork; #endif TQCString KIDNA::toAsciiCString(const TQString &idna) { -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported return KResolver::domainToAscii(idna); #else return TQCString(); @@ -41,7 +41,7 @@ TQCString KIDNA::toAsciiCString(const TQString &idna) TQString KIDNA::toAscii(const TQString &idna) { - if (idna.length() && (idna[0] == (QChar)'.')) + if (idna.length() && (idna[0] == (TQChar)'.')) { TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1))); if (host.isEmpty()) @@ -53,8 +53,8 @@ TQString KIDNA::toAscii(const TQString &idna) TQString KIDNA::toUnicode(const TQString &idna) { -#ifndef Q_WS_WIN //TODO kresolver not ported - if (idna.length() && (idna[0] == (QChar)'.')) +#ifndef TQ_WS_WIN //TODO kresolver not ported + if (idna.length() && (idna[0] == (TQChar)'.')) return idna[0] + KResolver::domainToUnicode(idna.mid(1)); return KResolver::domainToUnicode(idna); #else diff --git a/tdecore/kipc.cpp b/tdecore/kipc.cpp index e6ec7cc4e..8e6da23e2 100644 --- a/tdecore/kipc.cpp +++ b/tdecore/kipc.cpp @@ -30,7 +30,7 @@ #include <tqevent.h> #include <tqwindowdefs.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <kxerrorhandler.h> @@ -39,7 +39,7 @@ #include <kipc.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static long getSimpleProperty(Window w, Atom a) { Atom real_type; @@ -59,7 +59,7 @@ static long getSimpleProperty(Window w, Atom a) void KIPC::sendMessage(Message msg, WId w, int data) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 static Atom a = 0; if (a == 0) a = XInternAtom(tqt_xdisplay(), "KIPC_COMM_ATOM", False); @@ -88,7 +88,7 @@ void KIPC::sendMessage(Message msg, WId w, int data) void KIPC::sendMessageAll(Message msg, int data) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 unsigned int i, nrootwins; Window dw1, dw2, *rootwins = 0; Display *dpy = tqt_xdisplay(); diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h index e2774417d..5ff83ccbc 100644 --- a/tdecore/kkeynative.h +++ b/tdecore/kkeynative.h @@ -25,7 +25,7 @@ #include <tdeshortcut.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 typedef union _XEvent XEvent; #endif @@ -45,7 +45,7 @@ class TDECORE_EXPORT KKeyNative */ KKeyNative(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Extracts a new native key from the given xevent. * @param xevent the XEvent that contains the key @@ -76,7 +76,7 @@ class TDECORE_EXPORT KKeyNative */ void clear(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Initializes the native key by extracting the information * from the given xevent. @@ -111,7 +111,7 @@ class TDECORE_EXPORT KKeyNative /** * Returns the qt key code. * @return the qt key code or 0 if there is no key set. - * @see Qt::Key + * @see TQt::Key */ int keyCodeQt() const; @@ -205,7 +205,7 @@ class TDECORE_EXPORT KKeyNative */ static bool keyboardHasWinKey(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the mod flags to test diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp index d5ecb24da..8ab457a26 100644 --- a/tdecore/kkeynative_x11.cpp +++ b/tdecore/kkeynative_x11.cpp @@ -23,7 +23,7 @@ #include <tqnamespace.h> #include <tqwindowdefs.h> -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 #include "kkeynative.h" #include "kkeyserver_x11.h" @@ -34,7 +34,7 @@ #include <kdebug.h> #include <tdelocale.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_MISCELLANY #define XK_XKB_KEYS #include <X11/X.h> @@ -56,7 +56,7 @@ static KKeyNative* gx_pkey = 0; KKeyNative::KKeyNative() { clear(); } KKeyNative::KKeyNative( const KKey& key ) { init( key ); } KKeyNative::KKeyNative( const KKeyNative& key ) { init( key ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KKeyNative::KKeyNative( const XEvent* pEvent ) { init( pEvent ); } #endif @@ -77,7 +77,7 @@ void KKeyNative::clear() m_sym = 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool KKeyNative::init( const XEvent* pEvent ) { KeySym keySym; @@ -91,11 +91,11 @@ bool KKeyNative::init( const XEvent* pEvent ) bool KKeyNative::init( const KKey& key ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_sym = key.sym(); m_code = m_sym; //key.keyCodeQt(); m_mod = key.m_mod; -#elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX) +#elif !defined(TQ_WS_WIN) && !defined(TQ_WS_MACX) // Get any extra mods required by the sym. // E.g., XK_Plus requires SHIFT on the en layout. m_sym = key.sym(); @@ -167,7 +167,7 @@ KKeyNative& KKeyNative::null() KKey KKeyNative::key() const { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return KKey( m_sym, m_mod ); #else uint modSpec; @@ -192,7 +192,7 @@ int KKeyNative::keyCodeQt() const bool KKeyNative::keyboardHasWinKey() { return KKeyServer::keyboardHasWinKey(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint KKeyNative::modX( KKey::ModFlag modFlag ) { return KKeyServer::modX( modFlag ); } uint KKeyNative::accelModMaskX() { return KKeyServer::accelModMaskX(); } uint KKeyNative::modXNumLock() { return KKeyServer::modXNumLock(); } @@ -201,4 +201,4 @@ uint KKeyNative::modXScrollLock() { return KKeyServer::modXScrollLo uint KKeyNative::modXModeSwitch() { return KKeyServer::modXModeSwitch(); } #endif -#endif // Q_WS_X11 +#endif // TQ_WS_X11 diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index bb46338f4..77ca61763 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -25,7 +25,7 @@ #include <tqnamespace.h> #include <tqwindowdefs.h> -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 #include "kkeyserver_x11.h" #include "kkeynative.h" @@ -36,7 +36,7 @@ #include <tdeglobal.h> #include <tdelocale.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # define XK_MISCELLANY # define XK_XKB_KEYS # include <X11/X.h> @@ -48,14 +48,14 @@ #else # include <kckey.h> # define X11_ONLY(arg) -# define XK_ISO_Left_Tab Qt::Key_Backtab -# define XK_BackSpace Qt::Key_Backspace -# define XK_Sys_Req Qt::Key_SysReq -# define XK_Caps_Lock Qt::Key_CapsLock -# define XK_Num_Lock Qt::Key_NumLock -# define XK_Scroll_Lock Qt::Key_ScrollLock -# define XK_Prior Qt::Key_Prior -# define XK_Next Qt::Key_Next +# define XK_ISO_Left_Tab TQt::Key_Backtab +# define XK_BackSpace TQt::Key_Backspace +# define XK_Sys_Req TQt::Key_SysReq +# define XK_Caps_Lock TQt::Key_CapsLock +# define XK_Num_Lock TQt::Key_NumLock +# define XK_Scroll_Lock TQt::Key_ScrollLock +# define XK_Prior TQt::Key_Prior +# define XK_Next TQt::Key_Next #endif namespace KKeyServer @@ -78,7 +78,7 @@ struct ModInfo { KKey::ModFlag mod; int modQt; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint modX; #endif const char* psName; @@ -108,9 +108,9 @@ struct TransKey { static ModInfo g_rgModInfo[KKey::MOD_FLAG_COUNT] = { - { KKey::SHIFT, Qt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() }, - { KKey::CTRL, Qt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() }, - { KKey::ALT, Qt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() }, + { KKey::SHIFT, TQt::SHIFT, X11_ONLY(ShiftMask) I18N_NOOP("Shift"), TQString() }, + { KKey::CTRL, TQt::CTRL, X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() }, + { KKey::ALT, TQt::ALT, X11_ONLY(Mod1Mask) I18N_NOOP("Alt"), TQString() }, { KKey::WIN, KKey::QtWIN, X11_ONLY(Mod4Mask) I18N_NOOP("Win"), TQString() } }; @@ -140,7 +140,7 @@ static const SymName g_rgSymNames[] = { { 0, 0 } }; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static SymVariation g_rgSymVariation[] = { { '/', XK_KP_Divide, false }, @@ -156,85 +156,85 @@ static SymVariation g_rgSymVariation[] = // These are the X equivalents to the Qt keycodes 0x1000 - 0x1026 static const TransKey g_rgQtToSymX[] = { - { Qt::Key_Escape, XK_Escape }, - { Qt::Key_Tab, XK_Tab }, - { Qt::Key_Backtab, XK_ISO_Left_Tab }, - { Qt::Key_Backspace, XK_BackSpace }, - { Qt::Key_Return, XK_Return }, - { Qt::Key_Enter, XK_KP_Enter }, - { Qt::Key_Insert, XK_Insert }, - { Qt::Key_Delete, XK_Delete }, - { Qt::Key_Pause, XK_Pause }, + { TQt::Key_Escape, XK_Escape }, + { TQt::Key_Tab, XK_Tab }, + { TQt::Key_Backtab, XK_ISO_Left_Tab }, + { TQt::Key_Backspace, XK_BackSpace }, + { TQt::Key_Return, XK_Return }, + { TQt::Key_Enter, XK_KP_Enter }, + { TQt::Key_Insert, XK_Insert }, + { TQt::Key_Delete, XK_Delete }, + { TQt::Key_Pause, XK_Pause }, #ifdef sun - { Qt::Key_Print, XK_F22 }, + { TQt::Key_Print, XK_F22 }, #else - { Qt::Key_Print, XK_Print }, + { TQt::Key_Print, XK_Print }, #endif - { Qt::Key_SysReq, XK_Sys_Req }, - { Qt::Key_Home, XK_Home }, - { Qt::Key_End, XK_End }, - { Qt::Key_Left, XK_Left }, - { Qt::Key_Up, XK_Up }, - { Qt::Key_Right, XK_Right }, - { Qt::Key_Down, XK_Down }, + { TQt::Key_SysReq, XK_Sys_Req }, + { TQt::Key_Home, XK_Home }, + { TQt::Key_End, XK_End }, + { TQt::Key_Left, XK_Left }, + { TQt::Key_Up, XK_Up }, + { TQt::Key_Right, XK_Right }, + { TQt::Key_Down, XK_Down }, { TQt::Key_Prior, XK_Prior }, { TQt::Key_Next, XK_Next }, - //{ Qt::Key_Shift, 0 }, - //{ Qt::Key_Control, 0 }, - //{ Qt::Key_Meta, 0 }, - //{ Qt::Key_Alt, 0 }, - { Qt::Key_CapsLock, XK_Caps_Lock }, - { Qt::Key_NumLock, XK_Num_Lock }, - { Qt::Key_ScrollLock, XK_Scroll_Lock }, - { Qt::Key_F1, XK_F1 }, - { Qt::Key_F2, XK_F2 }, - { Qt::Key_F3, XK_F3 }, - { Qt::Key_F4, XK_F4 }, - { Qt::Key_F5, XK_F5 }, - { Qt::Key_F6, XK_F6 }, - { Qt::Key_F7, XK_F7 }, - { Qt::Key_F8, XK_F8 }, - { Qt::Key_F9, XK_F9 }, - { Qt::Key_F10, XK_F10 }, - { Qt::Key_F11, XK_F11 }, - { Qt::Key_F12, XK_F12 }, - { Qt::Key_F13, XK_F13 }, - { Qt::Key_F14, XK_F14 }, - { Qt::Key_F15, XK_F15 }, - { Qt::Key_F16, XK_F16 }, - { Qt::Key_F17, XK_F17 }, - { Qt::Key_F18, XK_F18 }, - { Qt::Key_F19, XK_F19 }, - { Qt::Key_F20, XK_F20 }, - { Qt::Key_F21, XK_F21 }, - { Qt::Key_F22, XK_F22 }, - { Qt::Key_F23, XK_F23 }, - { Qt::Key_F24, XK_F24 }, - { Qt::Key_F25, XK_F25 }, - { Qt::Key_F26, XK_F26 }, - { Qt::Key_F27, XK_F27 }, - { Qt::Key_F28, XK_F28 }, - { Qt::Key_F29, XK_F29 }, - { Qt::Key_F30, XK_F30 }, - { Qt::Key_F31, XK_F31 }, - { Qt::Key_F32, XK_F32 }, - { Qt::Key_F33, XK_F33 }, - { Qt::Key_F34, XK_F34 }, - { Qt::Key_F35, XK_F35 }, - { Qt::Key_Super_L, XK_Super_L }, - { Qt::Key_Super_R, XK_Super_R }, - { Qt::Key_Menu, XK_Menu }, - { Qt::Key_Hyper_L, XK_Hyper_L }, - { Qt::Key_Hyper_R, XK_Hyper_R }, - { Qt::Key_Help, XK_Help }, - //{ Qt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11 - //{ Qt::Key_Direction_R, XK_Direction_R }, + //{ TQt::Key_Shift, 0 }, + //{ TQt::Key_Control, 0 }, + //{ TQt::Key_Meta, 0 }, + //{ TQt::Key_Alt, 0 }, + { TQt::Key_CapsLock, XK_Caps_Lock }, + { TQt::Key_NumLock, XK_Num_Lock }, + { TQt::Key_ScrollLock, XK_Scroll_Lock }, + { TQt::Key_F1, XK_F1 }, + { TQt::Key_F2, XK_F2 }, + { TQt::Key_F3, XK_F3 }, + { TQt::Key_F4, XK_F4 }, + { TQt::Key_F5, XK_F5 }, + { TQt::Key_F6, XK_F6 }, + { TQt::Key_F7, XK_F7 }, + { TQt::Key_F8, XK_F8 }, + { TQt::Key_F9, XK_F9 }, + { TQt::Key_F10, XK_F10 }, + { TQt::Key_F11, XK_F11 }, + { TQt::Key_F12, XK_F12 }, + { TQt::Key_F13, XK_F13 }, + { TQt::Key_F14, XK_F14 }, + { TQt::Key_F15, XK_F15 }, + { TQt::Key_F16, XK_F16 }, + { TQt::Key_F17, XK_F17 }, + { TQt::Key_F18, XK_F18 }, + { TQt::Key_F19, XK_F19 }, + { TQt::Key_F20, XK_F20 }, + { TQt::Key_F21, XK_F21 }, + { TQt::Key_F22, XK_F22 }, + { TQt::Key_F23, XK_F23 }, + { TQt::Key_F24, XK_F24 }, + { TQt::Key_F25, XK_F25 }, + { TQt::Key_F26, XK_F26 }, + { TQt::Key_F27, XK_F27 }, + { TQt::Key_F28, XK_F28 }, + { TQt::Key_F29, XK_F29 }, + { TQt::Key_F30, XK_F30 }, + { TQt::Key_F31, XK_F31 }, + { TQt::Key_F32, XK_F32 }, + { TQt::Key_F33, XK_F33 }, + { TQt::Key_F34, XK_F34 }, + { TQt::Key_F35, XK_F35 }, + { TQt::Key_Super_L, XK_Super_L }, + { TQt::Key_Super_R, XK_Super_R }, + { TQt::Key_Menu, XK_Menu }, + { TQt::Key_Hyper_L, XK_Hyper_L }, + { TQt::Key_Hyper_R, XK_Hyper_R }, + { TQt::Key_Help, XK_Help }, + //{ TQt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11 + //{ TQt::Key_Direction_R, XK_Direction_R }, { '/', XK_KP_Divide }, { '*', XK_KP_Multiply }, { '-', XK_KP_Subtract }, { '+', XK_KP_Add }, - { Qt::Key_Return, XK_KP_Enter } + { TQt::Key_Return, XK_KP_Enter } #if TQT_VERSION >= 0x030100 // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special @@ -285,56 +285,56 @@ static const TransKey g_rgQtToSymX[] = #define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ // end of XF86keysyms.h , - { Qt::Key_Standby, XF86XK_Standby }, - { Qt::Key_VolumeDown, XF86XK_AudioLowerVolume }, - { Qt::Key_VolumeMute, XF86XK_AudioMute }, - { Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, - { Qt::Key_MediaPlay, XF86XK_AudioPlay }, - { Qt::Key_MediaStop, XF86XK_AudioStop }, + { TQt::Key_Standby, XF86XK_Standby }, + { TQt::Key_VolumeDown, XF86XK_AudioLowerVolume }, + { TQt::Key_VolumeMute, XF86XK_AudioMute }, + { TQt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, + { TQt::Key_MediaPlay, XF86XK_AudioPlay }, + { TQt::Key_MediaStop, XF86XK_AudioStop }, { TQt::Key_MediaPrev, XF86XK_AudioPrev }, - { Qt::Key_MediaNext, XF86XK_AudioNext }, - { Qt::Key_HomePage, XF86XK_HomePage }, - { Qt::Key_LaunchMail, XF86XK_Mail }, - { Qt::Key_Search, XF86XK_Search }, - { Qt::Key_MediaRecord, XF86XK_AudioRecord }, - { Qt::Key_LaunchMedia, XF86XK_AudioMedia }, - { Qt::Key_Launch1, XF86XK_Calculator }, - { Qt::Key_Back, XF86XK_Back }, - { Qt::Key_Forward, XF86XK_Forward }, - { Qt::Key_Stop, XF86XK_Stop }, - { Qt::Key_Refresh, XF86XK_Refresh }, - { Qt::Key_Favorites, XF86XK_Favorites }, - { Qt::Key_Launch0, XF86XK_MyComputer }, - { Qt::Key_OpenUrl, XF86XK_OpenURL }, - { Qt::Key_Launch2, XF86XK_Launch0 }, - { Qt::Key_Launch3, XF86XK_Launch1 }, - { Qt::Key_Launch4, XF86XK_Launch2 }, - { Qt::Key_Launch5, XF86XK_Launch3 }, - { Qt::Key_Launch6, XF86XK_Launch4 }, - { Qt::Key_Launch7, XF86XK_Launch5 }, - { Qt::Key_Launch8, XF86XK_Launch6 }, - { Qt::Key_Launch9, XF86XK_Launch7 }, - { Qt::Key_LaunchA, XF86XK_Launch8 }, - { Qt::Key_LaunchB, XF86XK_Launch9 }, - { Qt::Key_LaunchC, XF86XK_LaunchA }, - { Qt::Key_LaunchD, XF86XK_LaunchB }, - { Qt::Key_LaunchE, XF86XK_LaunchC }, - { Qt::Key_LaunchF, XF86XK_LaunchD }, - { Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, - { Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, - { Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, - { Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, - { Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, + { TQt::Key_MediaNext, XF86XK_AudioNext }, + { TQt::Key_HomePage, XF86XK_HomePage }, + { TQt::Key_LaunchMail, XF86XK_Mail }, + { TQt::Key_Search, XF86XK_Search }, + { TQt::Key_MediaRecord, XF86XK_AudioRecord }, + { TQt::Key_LaunchMedia, XF86XK_AudioMedia }, + { TQt::Key_Launch1, XF86XK_Calculator }, + { TQt::Key_Back, XF86XK_Back }, + { TQt::Key_Forward, XF86XK_Forward }, + { TQt::Key_Stop, XF86XK_Stop }, + { TQt::Key_Refresh, XF86XK_Refresh }, + { TQt::Key_Favorites, XF86XK_Favorites }, + { TQt::Key_Launch0, XF86XK_MyComputer }, + { TQt::Key_OpenUrl, XF86XK_OpenURL }, + { TQt::Key_Launch2, XF86XK_Launch0 }, + { TQt::Key_Launch3, XF86XK_Launch1 }, + { TQt::Key_Launch4, XF86XK_Launch2 }, + { TQt::Key_Launch5, XF86XK_Launch3 }, + { TQt::Key_Launch6, XF86XK_Launch4 }, + { TQt::Key_Launch7, XF86XK_Launch5 }, + { TQt::Key_Launch8, XF86XK_Launch6 }, + { TQt::Key_Launch9, XF86XK_Launch7 }, + { TQt::Key_LaunchA, XF86XK_Launch8 }, + { TQt::Key_LaunchB, XF86XK_Launch9 }, + { TQt::Key_LaunchC, XF86XK_LaunchA }, + { TQt::Key_LaunchD, XF86XK_LaunchB }, + { TQt::Key_LaunchE, XF86XK_LaunchC }, + { TQt::Key_LaunchF, XF86XK_LaunchD }, + { TQt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, + { TQt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, + { TQt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, + { TQt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, + { TQt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, #endif }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 //--------------------------------------------------------------------- // Initialization //--------------------------------------------------------------------- static bool g_bInitializedMods, g_bInitializedVariations, g_bInitializedKKeyLabels; static bool g_bMacLabels; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch; bool initializeMods() @@ -386,7 +386,7 @@ static void initializeVariations() g_rgSymVariation[i].bActive = (XKeysymToKeycode( tqt_xdisplay(), g_rgSymVariation[i].symVariation ) != 0); g_bInitializedVariations = true; } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 static void intializeKKeyLabels() { @@ -416,15 +416,15 @@ bool Sym::initQt( int keyQt ) { int symQt = keyQt & 0xffff; - if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) { + if( (keyQt & TQt::UNICODE_ACCEL) || symQt < 0x1000 ) { m_sym = TQChar(symQt).lower().unicode(); return true; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_sym = symQt; return true; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) { if( g_rgQtToSymX[i].keySymQt == symQt ) { m_sym = g_rgQtToSymX[i].keySymX; @@ -433,11 +433,11 @@ bool Sym::initQt( int keyQt ) } m_sym = 0; - if( symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt && - symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R ) + if( symQt != TQt::Key_Shift && symQt != TQt::Key_Control && symQt != TQt::Key_Alt && + symQt != TQt::Key_Meta && symQt != TQt::Key_Direction_L && symQt != TQt::Key_Direction_R ) kdDebug(125) << "Sym::initQt( " << TQString::number(keyQt,16) << " ): failed to convert key." << endl; return false; -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) m_sym = symQt; return true; #endif @@ -459,7 +459,7 @@ bool Sym::init( const TQString& s ) } } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN // search for name in KKeys array for ( KKeys const *pKey = kde_KKEYS; pKey->code != 0xffff; pKey++) { if( tqstricmp( s.latin1(), pKey->name ) == 0 ) { @@ -468,7 +468,7 @@ bool Sym::init( const TQString& s ) } } m_sym = 0; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) // search X list: 's' as is, all lower, first letter in caps m_sym = XStringToKeysym( s.latin1() ); if( !m_sym ) { @@ -490,12 +490,12 @@ int Sym::qt() const return TQChar(m_sym).upper(); return m_sym; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if( m_sym < 0x3000 ) return m_sym; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) if( m_sym < 0x3000 ) - return m_sym | Qt::UNICODE_ACCEL; + return m_sym | TQt::UNICODE_ACCEL; for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) if( g_rgQtToSymX[i].keySymX == m_sym ) @@ -511,7 +511,7 @@ TQString Sym::toString( bool bUserSpace ) const } // If it's a unicode character, -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN else if( m_sym < 0x1000 ) { #else else if( m_sym < 0x3000 ) { @@ -533,9 +533,9 @@ TQString Sym::toString( bool bUserSpace ) const } TQString s; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s = TQKeySequence( m_sym ); -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) // Get X-name s = XKeysymToString( m_sym ); #endif @@ -549,7 +549,7 @@ TQString Sym::toString() const { return toString( true ); } uint Sym::getModsRequired() const { uint mod = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // FIXME: This might not be true on all keyboard layouts! if( m_sym == XK_Sys_Req ) return KKey::ALT; if( m_sym == XK_Break ) return KKey::CTRL; @@ -580,7 +580,7 @@ uint Sym::getModsRequired() const uint Sym::getSymVariation() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !g_bInitializedVariations ) initializeVariations(); for( int i = 0; g_rgSymVariation[i].sym != 0; i++ ) @@ -603,7 +603,7 @@ void Sym::capitalizeKeyname( TQString& s ) // Public functions //--------------------------------------------------------------------- -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint modX( KKey::ModFlag mod ) { if( mod == KKey::WIN && !g_bInitializedMods ) @@ -632,7 +632,7 @@ uint accelModMaskX() initializeMods(); return ShiftMask | ControlMask | Mod1Mask | g_rgModInfo[3].modX; } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 bool keyQtToSym( int keyQt, uint& keySym ) { @@ -648,10 +648,10 @@ bool keyQtToMod( int keyQt, uint& mod ) { mod = 0; - if( keyQt & Qt::SHIFT ) mod |= KKey::SHIFT; - if( keyQt & Qt::CTRL ) mod |= KKey::CTRL; - if( keyQt & Qt::ALT ) mod |= KKey::ALT; - if( keyQt & Qt::META ) mod |= KKey::WIN; + if( keyQt & TQt::SHIFT ) mod |= KKey::SHIFT; + if( keyQt & TQt::CTRL ) mod |= KKey::CTRL; + if( keyQt & TQt::ALT ) mod |= KKey::ALT; + if( keyQt & TQt::META ) mod |= KKey::WIN; return true; } @@ -678,7 +678,7 @@ bool modToModQt( uint mod, int& modQt ) return true; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //wrapped bool modXToModQt( uint modX, int& modQt ) { @@ -688,9 +688,9 @@ bool modXToModQt( uint modX, int& modQt ) TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ) { int modQt = 0; - if (s & Qt::ShiftButton) modQt |= KKey::SHIFT; - if (s & Qt::ControlButton) modQt |= KKey::CTRL; - if (s & Qt::AltButton) modQt |= KKey::ALT; + if (s & TQt::ShiftButton) modQt |= KKey::SHIFT; + if (s & TQt::ControlButton) modQt |= KKey::CTRL; + if (s & TQt::AltButton) modQt |= KKey::ALT; return modQt; } @@ -699,7 +699,7 @@ bool keyboardHasWinKey() { return true; } -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) bool modXToModQt(uint modX, int& modQt) { @@ -715,7 +715,7 @@ bool modXToMod( uint , uint& ) { return false; } -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) bool modToModX( uint mod, uint& modX ) { @@ -785,7 +785,7 @@ bool codeXToSym( uchar codeX, uint modX, uint& sym ) sym = (uint) keySym; return true; } -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN static TQString modToString( uint mod, bool bUserSpace ) { @@ -841,7 +841,7 @@ uint stringUserToMod( const TQString& mod ) if( keySymQt < 0x1000 ) { // For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'. // So convert it back to lowercase if SHIFT isn't held down. - if( keySymQt >= Qt::Key_A && keySymQt <= Qt::Key_Z && !(keyCombQt & Qt::SHIFT) ) + if( keySymQt >= TQt::Key_A && keySymQt <= TQt::Key_Z && !(keyCombQt & TQt::SHIFT) ) keySymQt = tolower( keySymQt ); keySymX = keySymQt; } @@ -954,7 +954,7 @@ KKey Key::key() const if( m_code == CODE_FOR_QT ) return KKey( keyCodeQt() ); else { -#if defined(Q_WS_WIN) || defined(Q_WS_MACX) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX) return KKey(); #else uint mod; @@ -1043,7 +1043,7 @@ void Variations::init( const KKey& key, bool bQt ) // Ctrl+Pause => Ctrl+Break void KKey::simplify() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( m_sym == XK_Sys_Req ) { m_sym = XK_Print; m_mod |= ALT; @@ -1066,5 +1066,5 @@ void KKey::simplify() #endif } -#endif //Q_WS_X11 || Q_WS_WIN +#endif //TQ_WS_X11 || TQ_WS_WIN diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h index 90330911b..7632984e7 100644 --- a/tdecore/kkeyserver_x11.h +++ b/tdecore/kkeyserver_x11.h @@ -71,7 +71,7 @@ namespace KKeyServer * Initializes the symbol with the given Qt key code. * @param keyQt the qt key code * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ bool initQt( int keyQt ); @@ -153,7 +153,7 @@ namespace KKeyServer * @param key the key to get the data from * @param bQt true to take the Qt keycode, false * for the native key code - * @see Qt::Key + * @see TQt::Key * @see KKeyNative */ bool init( const KKey& key, bool bQt ); @@ -162,7 +162,7 @@ namespace KKeyServer * Checks whether the key code is a native code. * @return true if native code of the window system, * false if it is a Qt keycode - * @see Qt::Key + * @see TQt::Key * @see KKeyNative */ bool isNative() const { return m_code != CODE_FOR_QT; } @@ -351,7 +351,7 @@ namespace KKeyServer * @param keyQt the qt key code * @param sym if successful, the symbol will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); @@ -362,7 +362,7 @@ namespace KKeyServer * @param keyQt the qt key code * @param mod if successful, the modifiers will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); @@ -371,7 +371,7 @@ namespace KKeyServer * @param sym the symbol * @param keyQt if successful, the qt key code will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); @@ -383,7 +383,7 @@ namespace KKeyServer * @param modQt the mask of Qt key code modifiers will be written here, * if successful * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see KKey */ TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); @@ -406,7 +406,7 @@ namespace KKeyServer * @param modQt the mask of Qt key code modifiers will be written here * if successful * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ //wrapped for win32 TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); @@ -414,7 +414,7 @@ namespace KKeyServer /** * Converts the Qt-compatible button state to x11 modifier. */ - TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -435,7 +435,7 @@ namespace KKeyServer * @param modX the mask of ORed X11 modifiers * @param symX if successful, the X11 symbol will be written here * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key * @see Sym */ TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index 87a75cebd..ca77c5f8c 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -27,7 +27,7 @@ #include "tdeapplication.h" #include "klibloader.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kdebug.h" #include "tdelocale.h" @@ -121,8 +121,8 @@ KLibrary::~KLibrary() for ( ; it.current() ; ++it ) { kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl; - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); } m_objs.setAutoDelete(true); m_objs.clear(); @@ -172,8 +172,8 @@ KLibFactory* KLibrary::factory() return 0; } - connect( m_factory, TQT_SIGNAL( objectCreated( TQObject * ) ), - this, TQT_SLOT( slotObjectCreated( TQObject * ) ) ); + connect( m_factory, TQ_SIGNAL( objectCreated( TQObject * ) ), + this, TQ_SLOT( slotObjectCreated( TQObject * ) ) ); return m_factory; } @@ -214,15 +214,15 @@ void KLibrary::slotObjectCreated( TQObject *obj ) if ( m_objs.containsRef( obj ) ) return; // we know this object already - connect( obj, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); m_objs.append( obj ); } void KLibrary::slotObjectDestroyed() { - m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) ); + m_objs.removeRef( sender() ); if ( m_objs.count() == 0 ) { @@ -232,8 +232,8 @@ void KLibrary::slotObjectDestroyed() if ( !m_timer ) { m_timer = new TQTimer( this, "klibrary_shutdown_timer" ); - connect( m_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotTimeout() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotTimeout() ) ); } // as long as it's not stable make the timeout short, for debugging @@ -447,8 +447,8 @@ KLibrary* KLibLoader::library( const char *name ) } m_libs.insert( name, wrap ); - connect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + connect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); return wrap->lib; } @@ -470,8 +470,8 @@ void KLibLoader::unloadLibrary( const char *libname ) m_libs.remove( libname ); - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); close_pending( wrap ); } @@ -511,8 +511,8 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) for (; it.current(); ++it) { wrap = it.current(); if (wrap->lib) { - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); KLibrary* to_delete = wrap->lib; wrap->lib = 0L; // unset first, because KLibrary dtor can cause delete to_delete; // recursive call to close_pending() @@ -551,17 +551,17 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) We need to make sure to clear the clipboard before unloading a DSO because the DSO could have defined an object derived from QMimeSource and placed that on the clipboard. */ - /*kapp->clipboard()->clear();*/ + /*tdeApp->clipboard()->clear();*/ /* Well.. let's do something more subtle... convert the clipboard context to text. That should be safe as it only uses objects defined by Qt. */ - if( kapp->clipboard()->ownsSelection()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); + if( tdeApp->clipboard()->ownsSelection()) { + tdeApp->clipboard()->setText( + tdeApp->clipboard()->text( TQClipboard::Selection ), TQClipboard::Selection ); } - if( kapp->clipboard()->ownsClipboard()) { - kapp->clipboard()->setText( - kapp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); + if( tdeApp->clipboard()->ownsClipboard()) { + tdeApp->clipboard()->setText( + tdeApp->clipboard()->text( TQClipboard::Clipboard ), TQClipboard::Clipboard ); } } diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index d9e632184..813106164 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -36,7 +36,7 @@ class KLibLoaderPrivate; class KLibraryPrivate; # define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \ - extern "C" { KDE_EXPORT void *init_##libname() { return new factory; } } + extern "C" { TDE_EXPORT void *init_##libname() { return new factory; } } /** * @short Represents a dynamically loaded library. @@ -52,7 +52,7 @@ class TDECORE_EXPORT KLibrary : public TQObject friend class KLibLoader; friend class TQAsciiDict<KLibrary>; - Q_OBJECT + TQ_OBJECT public: /** * Don't create KLibrary objects on your own. Instead use KLibLoader. @@ -143,7 +143,7 @@ class TDECORE_EXPORT KLibLoader : public TQObject { friend class KLibrary; - Q_OBJECT + TQ_OBJECT public: /** * You should NEVER destruct an instance of KLibLoader @@ -322,7 +322,7 @@ private: * The KLibFactory is used to create the components, the library has to offer. * The factory of KSpread for example will create instances of KSpreadDoc, * while the Konqueror factory will create KonqView widgets. - * All objects created by the factory must be derived from TQObject, since QObject + * All objects created by the factory must be derived from TQObject, since TQObject * offers type safe casting. * * KLibFactory is an abstract class. Reimplement the @@ -332,7 +332,7 @@ private: */ class TDECORE_EXPORT KLibFactory : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Create a new factory. @@ -349,7 +349,7 @@ public: * It is valid behavior to create different kinds of objects * depending on the requested @p classname. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * create() automatically emits a signal objectCreated to tell @@ -363,7 +363,7 @@ public: * @param args a list of arguments */ - TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() ); signals: /** @@ -382,7 +382,7 @@ protected: * It is valid behavior to create different kinds of objects * depending on the requested @p className. For example a koffice * library may usually return a pointer to KoDocument. But - * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget, + * if asked for a "TQWidget", it could create a wrapper widget, * that encapsulates the Koffice specific features. * * This function is called by #create() @@ -392,7 +392,7 @@ protected: * @param args a list of arguments */ virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* className = TQOBJECT_OBJECT_NAME_STRING, + const char* className = "TQObject", const TQStringList &args = TQStringList() ) = 0; diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp index 9cfddcc63..a2ece0a40 100644 --- a/tdecore/kmacroexpander.cpp +++ b/tdecore/kmacroexpander.cpp @@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str ) TQString rsts; for (pos = 0; pos < str.length(); ) { - if (ec != (QChar)0) { + if (ec != (TQChar)0) { if (str.unicode()[pos] != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) while (pos < str.length()) { TQChar cc( str.unicode()[pos] ); - if (ec != (QChar)0) { + if (ec != (TQChar)0) { if (cc != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -160,20 +160,20 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) continue; nohit: if (state.current == singlequote) { - if (cc == (QChar)'\'') + if (cc == (TQChar)'\'') state = sstack.pop(); - } else if (cc == (QChar)'\\') { + } else if (cc == (TQChar)'\\') { // always swallow the char -> prevent anomalies due to expansion pos += 2; continue; } else if (state.current == dollarquote) { - if (cc == (QChar)'\'') + if (cc == (TQChar)'\'') state = sstack.pop(); - } else if (cc == (QChar)'$') { + } else if (cc == (TQChar)'$') { cc = str[++pos]; - if (cc == (QChar)'(') { + if (cc == (TQChar)'(') { sstack.push( state ); - if (str[pos + 1] == (QChar)'(') { + if (str[pos + 1] == (TQChar)'(') { Save sav = { str, pos + 2 }; ostack.push( sav ); state.current = math; @@ -183,21 +183,21 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state.current = paren; state.dquote = false; } - } else if (cc == (QChar)'{') { + } else if (cc == (TQChar)'{') { sstack.push( state ); state.current = subst; } else if (!state.dquote) { - if (cc == (QChar)'\'') { + if (cc == (TQChar)'\'') { sstack.push( state ); state.current = dollarquote; - } else if (cc == (QChar)'"') { + } else if (cc == (TQChar)'"') { sstack.push( state ); state.current = doublequote; state.dquote = true; } } // always swallow the char -> prevent anomalies due to expansion - } else if (cc == (QChar)'`') { + } else if (cc == (TQChar)'`') { str.replace( pos, 1, "$( " ); // add space -> avoid creating $(( pos2 = pos += 3; for (;;) { @@ -206,12 +206,12 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) return false; } cc = str.unicode()[pos2]; - if (cc == (QChar)'`') + if (cc == (TQChar)'`') break; - if (cc == (QChar)'\\') { + if (cc == (TQChar)'\\') { cc = str[++pos2]; - if (cc == (QChar)'$' || cc == (QChar)'`' || cc == (QChar)'\\' || - (cc == (QChar)'"' && state.dquote)) + if (cc == (TQChar)'$' || cc == (TQChar)'`' || cc == (TQChar)'\\' || + (cc == (TQChar)'"' && state.dquote)) { str.remove( pos2 - 1, 1 ); continue; @@ -225,25 +225,25 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state.dquote = false; continue; } else if (state.current == doublequote) { - if (cc == (QChar)'"') + if (cc == (TQChar)'"') state = sstack.pop(); - } else if (cc == (QChar)'\'') { + } else if (cc == (TQChar)'\'') { if (!state.dquote) { sstack.push( state ); state.current = singlequote; } - } else if (cc == (QChar)'"') { + } else if (cc == (TQChar)'"') { if (!state.dquote) { sstack.push( state ); state.current = doublequote; state.dquote = true; } } else if (state.current == subst) { - if (cc == (QChar)'}') + if (cc == (TQChar)'}') state = sstack.pop(); - } else if (cc == (QChar)')') { + } else if (cc == (TQChar)')') { if (state.current == math) { - if (str[pos + 1] == (QChar)')') { + if (str[pos + 1] == (TQChar)')') { state = sstack.pop(); pos += 2; } else { @@ -261,15 +261,15 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) state = sstack.pop(); else break; - } else if (cc == (QChar)'}') { + } else if (cc == (TQChar)'}') { if (state.current == KMacroExpander::group) state = sstack.pop(); else break; - } else if (cc == (QChar)'(') { + } else if (cc == (TQChar)'(') { sstack.push( state ); state.current = paren; - } else if (cc == (QChar)'{') { + } else if (cc == (TQChar)'{') { sstack.push( state ); state.current = KMacroExpander::group; } @@ -407,9 +407,9 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po return 2; } uint sl, rsl, rpos; - if (str[pos + 1] == (QChar)'{') { + if (str[pos + 1] == (TQChar)'{') { rpos = pos + 2; - for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++) + for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++) if (rpos + sl >= str.length()) return 0; rsl = sl + 3; @@ -473,9 +473,9 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL return 2; } uint sl, rsl, rpos; - if (str[pos + 1] == (QChar)'{') { + if (str[pos + 1] == (TQChar)'{') { rpos = pos + 2; - for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++) + for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++) if (rpos + sl >= str.length()) return 0; rsl = sl + 3; @@ -494,7 +494,7 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL //////////// template<class KT,class VT> -inline QString +inline TQString TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) { TQString str( ostr ); @@ -504,7 +504,7 @@ TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) } template<class KT,class VT> -inline QString +inline TQString TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c ) { TQString str( ostr ); diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp index 2e019f73e..8dc2f3f48 100644 --- a/tdecore/kmanagerselection.cpp +++ b/tdecore/kmanagerselection.cpp @@ -41,7 +41,7 @@ DEALINGS IN THE SOFTWARE. #endif #include <tqobject.h> -#ifdef Q_WS_X11 // FIXME(E) +#ifdef TQ_WS_X11 // FIXME(E) #include "kmanagerselection.h" @@ -52,7 +52,7 @@ DEALINGS IN THE SOFTWARE. #include <X11/Xatom.h> class TDESelectionOwnerPrivate - : public QWidget + : public TQWidget { public: TDESelectionOwnerPrivate( TDESelectionOwner* owner ); @@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P ) : owner( owner_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + tdeApp->installX11EventFilter( this ); } bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P ) @@ -367,7 +367,7 @@ Atom TDESelectionOwner::xa_timestamp = None; class TDESelectionWatcherPrivate - : public QWidget + : public TQWidget { public: TDESelectionWatcherPrivate( TDESelectionWatcher* watcher ); @@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P ) : watcher( watcher_P ) { - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + tdeApp->installX11EventFilter( this ); } bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P ) diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h index de294187d..59cc35c56 100644 --- a/tdecore/kmanagerselection.h +++ b/tdecore/kmanagerselection.h @@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <tqobject.h> #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 // FIXME(E) +#ifdef TQ_WS_X11 // FIXME(E) #include <X11/Xlib.h> @@ -50,7 +46,7 @@ class TDESelectionOwnerPrivate; class TDECORE_EXPORT TDESelectionOwner : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * This constructor initializes the object, but doesn't perform any @@ -173,7 +169,7 @@ class TDESelectionWatcherPrivate; class TDECORE_EXPORT TDESelectionWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * This constructor initializes the object, but doesn't perform any diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp index 8ed02941e..c13c22e2d 100644 --- a/tdecore/kmimesourcefactory.cpp +++ b/tdecore/kmimesourcefactory.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include "kmimesourcefactory.h" diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp index a9be89e76..e5a67e0f3 100644 --- a/tdecore/kmountpoint.cpp +++ b/tdecore/kmountpoint.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kmountpoint.h" @@ -33,6 +33,7 @@ #include <volmgt.h> #endif #ifdef HAVE_SYS_MNTTAB_H +#include <stdio.h> #include <sys/mnttab.h> #endif #ifdef HAVE_MNTENT_H @@ -239,12 +240,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) KMountPoint *mp = new KMountPoint(); mp->m_mountedFrom = TQFile::decodeName(mounted[i].f_mntfromname); mp->m_mountPoint = TQFile::decodeName(mounted[i].f_mntonname); - -#ifdef __osf__ - mp->m_mountType = TQFile::decodeName(mnt_names[mounted[i].f_type]); -#else mp->m_mountType = TQFile::decodeName(mounted[i].f_fstypename); -#endif if (infoNeeded & NeedMountOptions) { @@ -333,7 +329,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) } free( mntctl_buffer ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //TODO? #else STRUCT_SETMNTENT mnttab; diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index b1989fbf6..7d4c675d7 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -24,14 +24,14 @@ #include <tqptrstack.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <dcopclient.h> #include <kdebug.h> #include <kstaticdeleter.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -74,14 +74,14 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, int present, int level, const TQString &sound, const TQString &file, int winId ) { - if (!kapp) return 0; + if (!tdeApp) return 0; // ensure tray icon is shown and positioned before sending event to notification daemon -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XFlush(tqt_xdisplay()); #endif - DCOPClient *client=kapp->dcopClient(); + DCOPClient *client=tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); @@ -94,10 +94,10 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, if( canAvoidStartupEvent( message, appname, present )) return -1; // done "successfully" - there will be no event presentation - int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! + int uniqueId = kMax( 1, tdeApp->random() ); // must not be 0 -- means failure! // knotify daemon needs toplevel window - TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); + TQWidget* widget = TQWidget::find( (WId)winId ); if( widget ) winId = (int)widget->topLevelWidget()->winId(); @@ -238,7 +238,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present) bool KNotifyClient::startDaemon() { static bool firstTry = true; - if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) { + if (!tdeApp->dcopClient()->isApplicationRegistered(daemonName)) { if( firstTry ) { firstTry = false; return TDEApplication::startServiceByDesktopName(daemonName) == 0; @@ -251,12 +251,12 @@ bool KNotifyClient::startDaemon() void KNotifyClient::beep(const TQString& reason) { - if ( !kapp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) { + if ( !tdeApp || KNotifyClient::Instance::currentInstance()->useSystemBell() ) { TQApplication::beep(); return; } - DCOPClient *client=kapp->dcopClient(); + DCOPClient *client=tdeApp->dcopClient(); if (!client->isAttached()) { client->attach(); @@ -307,7 +307,7 @@ public: { if (m_instances.isEmpty()) { - m_defaultInstance = new Instance(kapp); + m_defaultInstance = new Instance(tdeApp); } return m_instances.top(); } @@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const // static methods // We always return a valid KNotifyClient::Instance here. If no special one -// is available, we have a default-instance with kapp as TDEInstance. +// is available, we have a default-instance with tdeApp as TDEInstance. // We make sure to always have that default-instance in the stack, because // the stack might have gotten cleared in the destructor. // We can't use QPtrStack::setAutoDelete( true ), because no instance besides diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h index a824d5a37..d9afbf8f4 100644 --- a/tdecore/knotifyclient.h +++ b/tdecore/knotifyclient.h @@ -185,7 +185,7 @@ namespace KNotifyClient * the user connected the event to sound, only. Can be TQString::null. * @return a value > 0, unique for this event if successful, 0 otherwise */ - TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) KDE_DEPRECATED; + TDECORE_EXPORT int event(const TQString &message, const TQString &text=TQString::null) TDE_DEPRECATED; /** * @deprecated @@ -194,7 +194,7 @@ namespace KNotifyClient * @param text The text explaining the event you raise. Can be TQString::null. * @return a value > 0, unique for this event if successful, 0 otherwise */ - TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) KDE_DEPRECATED; + TDECORE_EXPORT int event( StandardEvent event, const TQString& text=TQString::null ) TDE_DEPRECATED; /** * @deprecated @@ -207,7 +207,7 @@ namespace KNotifyClient * @return a value > 0, unique for this event if successful, 0 otherwise */ TDECORE_EXPORT int userEvent(const TQString &text=TQString::null, int present=Default, int level=Default, - const TQString &sound=TQString::null, const TQString &file=TQString::null) KDE_DEPRECATED; + const TQString &sound=TQString::null, const TQString &file=TQString::null) TDE_DEPRECATED; //#endif @@ -217,7 +217,7 @@ namespace KNotifyClient * placed appropriately. * * Call it by KNotifyClient::event(widget->winId(), "EventName"); - * It will use TDEApplication::kApplication->dcopClient() to communicate to + * It will use TDEApplication::tdeApplication->dcopClient() to communicate to * the server * @param winId The winId() of the widget where the event originates * @param message The name of the event diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 7335e8e14..66f235e5e 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqtextstream.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <ksavefile.h> #include <kstringhandler.h> diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 4377ec9ce..482181784 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -18,18 +18,18 @@ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) #undef TDEIO_EXPORT -#define TDEIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT TDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE #include "kprotocolinfo.h" #include "kprotocolinfofactory.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeconfig.h> #include <kstringhandler.h> @@ -58,7 +58,7 @@ KProtocolInfo::KProtocolInfo(const TQString &path) d = new KProtocolInfoPrivate; TQString fullPath = locate("services", path); - KSimpleConfig config( fullPath, true ); + TDESimpleConfig config( fullPath, true ); config.setGroup( "Protocol" ); m_name = config.readEntry( "protocol" ); diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp index 115a44f25..19efdc465 100644 --- a/tdecore/kprotocolinfofactory.cpp +++ b/tdecore/kprotocolinfofactory.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index 1e5806133..d801b7c9a 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -24,17 +24,12 @@ #include <config.h> #include "kpty.h" -#include "kprocess.h" +#include "tdeprocess.h" #ifdef __sgi #define __svr4__ #endif -#ifdef __osf__ -#define _OSF_SOURCE -#include <float.h> -#endif - #ifdef _AIX #define _ALL_SOURCE #endif @@ -91,11 +86,9 @@ extern "C" { } #endif -#if !defined(__osf__) -# ifdef HAVE_TERMIO_H +#ifdef HAVE_TERMIO_H /* needed at least on AIX */ -# include <termio.h> -# endif +# include <termio.h> #endif #if defined(HAVE_TCGETATTR) @@ -128,7 +121,7 @@ extern "C" { #endif #include <kdebug.h> -#include <kstandarddirs.h> // locate +#include <tdestandarddirs.h> // locate #ifndef CINTR #define CINTR 0x03 @@ -217,49 +210,60 @@ bool KPty::setPty(int pty_master) bool KPty::_attachPty(int pty_master) { - TQCString ptyName; + if (d->slaveFd < 0 ) { kdDebug(175) << "KPty::_attachPty(): " << pty_master << endl; -#if defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT) +#if defined(HAVE_PTSNAME) char *ptsn = ptsname(d->masterFd); if (ptsn) { - grantpt(d->masterFd); d->ttyName = ptsn; } else { ::close(d->masterFd); d->masterFd = -1; + return false; } #endif - struct stat st; - if (stat(d->ttyName.data(), &st)) - return false; // this just cannot happen ... *cough* Yeah right, I just - // had it happen when pty #349 was allocated. I guess - // there was some sort of leak? I only had a few open. - if (((st.st_uid != getuid()) || - (st.st_mode & (S_IRGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH))) && - !chownpty(true)) - { - kdWarning(175) - << "KPty::_attachPty(): " << "chownpty failed for device " << ptyName << "::" << d->ttyName << endl - << "KPty::_attachPty(): " << "This means the communication can be eavesdropped." << endl; - } +#if defined(HAVE_GRANTPT) + if (grantpt(d->masterFd)) { + return false; + } +#else + struct stat st; + if (stat(d->ttyName.data(), &st)) + return false; // this just cannot happen ... *cough* Yeah right, I just + // had it happen when pty #349 was allocated. I guess + // there was some sort of leak? I only had a few open. + if (((st.st_uid != getuid()) || + (st.st_mode & (S_IRGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH))) && + !chownpty(true)) + { + kdWarning(175) + << "KPty::_attachPty(): " << "chownpty failed for device " << d->ttyName << endl + << "KPty::_attachPty(): " << "This means the communication can be eavesdropped." << endl; + } +#endif #ifdef BSD - revoke(d->ttyName.data()); + revoke(d->ttyName.data()); #endif #ifdef HAVE_UNLOCKPT - unlockpt(d->masterFd); + unlockpt(d->masterFd); #endif - d->slaveFd = ::open(d->ttyName.data(), O_RDWR | O_NOCTTY); - if (d->slaveFd < 0) - { - kdWarning(175) << "KPty::_attachPty(): " << "Can't open slave pseudo teletype" << endl; - ::close(d->masterFd); - d->masterFd = -1; - return false; + d->slaveFd = ::open(d->ttyName.data(), O_RDWR | O_NOCTTY); + if (d->slaveFd < 0) + { + kdWarning(175) << "KPty::_attachPty(): " << "Can't open slave pseudo teletype" << endl; + ::close(d->masterFd); + d->masterFd = -1; + return false; + } +#ifdef HAVE_OPENPTY + // set screen size + ioctl(d->slaveFd, TIOCSWINSZ, (char *)&d->winSize); +#endif } #if (defined(__svr4__) || defined(__sgi__)) @@ -294,8 +298,10 @@ bool KPty::_attachPty(int pty_master) _tcsetattr(d->slaveFd, &ttmode); +#ifndef HAVE_OPENPTY // set screen size ioctl(d->slaveFd, TIOCSWINSZ, (char *)&d->winSize); +#endif fcntl(d->masterFd, F_SETFD, FD_CLOEXEC); fcntl(d->slaveFd, F_SETFD, FD_CLOEXEC); @@ -308,7 +314,7 @@ bool KPty::open() if (d->masterFd >= 0) return true; -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(HAVE_OPENPTY) char cpty[16]; if (openpty(&d->masterFd, &d->slaveFd, cpty, NULL, &d->winSize) == 0) { @@ -329,7 +335,11 @@ bool KPty::open() // We try, as we know them, one by one. #if defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT) -#ifdef _AIX +#if defined(HAVE_GETPT) + d->masterFd = ::getpt(); +#elif defined(HAVE_POSIX_OPENPT) + d->masterFd = ::posix_openpt(O_RDWR); +#elif defined(_AIX) d->masterFd = ::open("/dev/ptc",O_RDWR); #else d->masterFd = ::open("/dev/ptmx",O_RDWR); diff --git a/tdecore/kqiodevicegzip_p.cpp b/tdecore/kqiodevicegzip_p.cpp index 0dcabed74..9ad82a653 100644 --- a/tdecore/kqiodevicegzip_p.cpp +++ b/tdecore/kqiodevicegzip_p.cpp @@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void) close(); } -bool KQIODeviceGZip::open(TQ_OpenMode mode) +bool KQIODeviceGZip::open(int mode) { if (m_gzfile) close(); // One file is already open, so close it first. @@ -78,11 +78,7 @@ void KQIODeviceGZip::flush(void) } } -#ifdef USE_QT4 -qint64 KQIODeviceGZip::size(void) const -#else // USE_QT4 TQIODevice::Offset KQIODeviceGZip::size(void) const -#endif // USE_QT4 { return 0; // You cannot determine size! } @@ -115,7 +111,7 @@ bool KQIODeviceGZip::reset(void) return (gzrewind(m_gzfile)>=0); } -TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) +TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen ) { TQ_LONG result=0; if (m_gzfile) @@ -126,7 +122,7 @@ TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) return result; } -TQT_TQIO_LONG KQIODeviceGZip::tqwriteBlock( const char *data, TQT_TQIO_ULONG len ) +TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len ) { TQ_ULONG result=0; if (m_gzfile) diff --git a/tdecore/kqiodevicegzip_p.h b/tdecore/kqiodevicegzip_p.h index 0581602c1..182b26141 100644 --- a/tdecore/kqiodevicegzip_p.h +++ b/tdecore/kqiodevicegzip_p.h @@ -38,22 +38,18 @@ public: KQIODeviceGZip(const TQString& filename); ~KQIODeviceGZip(void); - bool open(TQ_OpenMode mode); + bool open(int mode); void close(void); void flush(void); -#ifdef USE_QT4 - qint64 size(void) const; -#else // USE_QT4 Offset size(void) const; -#endif // USE_QT4 Offset at(void) const; bool at(Offset pos); bool atEnd(void) const; bool reset (void); - TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); - TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); + TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + TQ_LONG writeBlock( const char *data, TQ_ULONG len ); int getch(void); int putch(int ch); diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h index 256d03f17..50c413c47 100644 --- a/tdecore/krandomsequence.h +++ b/tdecore/krandomsequence.h @@ -46,7 +46,7 @@ public: * reproduced by starting the sequence with the same seed. * * If you need a single value which needs to be unpredictable, - * you need to use kapp->random() instead. + * you need to use tdeApp->random() instead. * * @param lngSeed Seed to initialize the sequence with. * If lngSeed is 0, the sequence is initialized with a value from diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h index cc5ff0ea6..0bb2b04ca 100644 --- a/tdecore/kregexp.h +++ b/tdecore/kregexp.h @@ -57,7 +57,7 @@ class KRegExpPrivate; * * @author Torben Weis <weis@kde.org> */ -class TDECORE_EXPORT KDE_DEPRECATED KRegExp +class TDECORE_EXPORT TDE_DEPRECATED KRegExp { public: diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp index d9a374d0c..08691fd15 100644 --- a/tdecore/krfcdate.cpp +++ b/tdecore/krfcdate.cpp @@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) mday = l[2].toUInt(); // Z suffix means UTC. - if ((QChar)'Z' == timeString.at(timeString.length() - 1)) { + if ((TQChar)'Z' == timeString.at(timeString.length() - 1)) { timeString.remove(timeString.length() - 1, 1); } @@ -431,12 +431,16 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) l = TQStringList::split(':', timeString); - if (l.size() < 3) + // If the 'T' separator was included, there must at least + // be the hour, if not then it is invalid. + if (l.size() < 1) return 0; hour = l[0].toUInt(); - min = l[1].toUInt(); - sec = l[2].toUInt(); + + // Minutes and seconds can be omitted. + min = (l.size() >= 2) ? l[1].toUInt() : 0; + sec = (l.size() >= 3) ? l[2].toUInt() : 0; time_t result = ymdhms_to_seconds(year, month, mday, hour, min, sec); diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp index c717a1823..72fd5ae78 100644 --- a/tdecore/krootprop.cpp +++ b/tdecore/krootprop.cpp @@ -20,7 +20,7 @@ #include <tqwidget.h> #include "config.h" -#ifdef Q_WS_X11 // not needed anyway :-) +#ifdef TQ_WS_X11 // not needed anyway :-) #include "krootprop.h" #include "tdeglobal.h" diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp index 4ad96c0f2..9bf409c1c 100644 --- a/tdecore/ksavefile.cpp +++ b/tdecore/ksavefile.cpp @@ -38,7 +38,7 @@ #include <kde_file.h> #include "tdeapplication.h" #include "ksavefile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" KSaveFile::KSaveFile(const TQString &filename, int mode) : mTempFile(true) @@ -171,7 +171,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir else nameOnly = cFilename.mid(slash + 1); cBackup = TQFile::encodeName(backupDir); - if ( backupDir[backupDir.length()-1] != (QChar)'/' ) + if ( backupDir[backupDir.length()-1] != (TQChar)'/' ) cBackup += '/'; cBackup += nameOnly; } diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp index 7e4eda947..155ecdb1c 100644 --- a/tdecore/kshell.cpp +++ b/tdecore/kshell.cpp @@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) c = args.unicode()[pos++]; } while (c.isSpace()); TQString cret; - if ((flags & TildeExpand) && c == (QChar)'~') { + if ((flags & TildeExpand) && c == (TQChar)'~') { uint opos = pos; for (; ; pos++) { if (pos >= args.length()) break; c = args.unicode()[pos]; - if (c == (QChar)'/' || c.isSpace()) + if (c == (TQChar)'/' || c.isSpace()) break; if (isQuoteMeta( c )) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if ((flags & AbortOnMeta) && isMeta( c )) @@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() ); if (ccret.isEmpty()) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if (pos >= args.length()) { @@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) } // before the notilde label, as a tilde does not match anyway if (firstword) { - if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) { + if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) { uint pos2 = pos; TQChar cc; do cc = args[pos2++]; - while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') || - (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9')); - if (cc == (QChar)'=') + while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') || + (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9')); + if (cc == (TQChar)'=') goto metaerr; } } notilde: do { - if (c == (QChar)'\'') { + if (c == (TQChar)'\'') { uint spos = pos; do { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - } while (c != (QChar)'\''); + } while (c != (TQChar)'\''); cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string(); - } else if (c == (QChar)'"') { + } else if (c == (TQChar)'"') { for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'"') + if (c == (TQChar)'"') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c != (QChar)'"' && c != (QChar)'\\' && - !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))) - cret += (QChar)'\\'; - } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')) + if (c != (TQChar)'"' && c != (TQChar)'\\' && + !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))) + cret += (TQChar)'\\'; + } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')) goto metaerr; cret += c; } - } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') { + } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') { pos++; for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'\'') + if (c == (TQChar)'\'') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; switch (c) { - case 'a': cret += (QChar)'\a'; break; - case 'b': cret += (QChar)'\b'; break; - case 'e': cret += (QChar)'\033'; break; - case 'f': cret += (QChar)'\f'; break; - case 'n': cret += (QChar)'\n'; break; - case 'r': cret += (QChar)'\r'; break; - case 't': cret += (QChar)'\t'; break; - case '\\': cret += (QChar)'\\'; break; - case '\'': cret += (QChar)'\''; break; + case 'a': cret += (TQChar)'\a'; break; + case 'b': cret += (TQChar)'\b'; break; + case 'e': cret += (TQChar)'\033'; break; + case 'f': cret += (TQChar)'\f'; break; + case 'n': cret += (TQChar)'\n'; break; + case 'r': cret += (TQChar)'\r'; break; + case 't': cret += (TQChar)'\t'; break; + case '\\': cret += (TQChar)'\\'; break; + case '\'': cret += (TQChar)'\''; break; case 'c': cret += args[pos++] & 31; break; case 'x': { @@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) break; } default: - if (c >= (QChar)'0' && c <= (QChar)'7') { + if (c >= (TQChar)'0' && c <= (TQChar)'7') { int hv = c - '0'; for (int i = 0; i < 2; i++) { c = args[pos]; - if (c < (QChar)'0' || c > (QChar)'7') + if (c < (TQChar)'0' || c > (TQChar)'7') break; hv = hv * 8 + (c - '0'); pos++; @@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) cret += c; } } else { - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; @@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) TQString KShell::tildeExpand( const TQString &fname ) { - if (fname[0] == (QChar)'~') { + if (fname[0] == (TQChar)'~') { int pos = fname.find( '/' ); if (pos < 0) return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() ); diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index a001b5c06..7d9cfa70c 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* This file is part of the KDE libraries Copyright (C) 1998 Sven Radej <sven@lisa.exp.univie.ac.at> @@ -53,11 +52,17 @@ // debug #include <sys/ioctl.h> +#ifdef Q_OS_SOLARIS +#include <sys/filio.h> /* FIONREAD is defined here */ +#endif /* solaris */ + #ifdef HAVE_INOTIFY #include <unistd.h> #include <fcntl.h> #include <sys/syscall.h> +#ifdef Q_OS_LINUX #include <linux/types.h> +#endif /* Linux */ // Linux kernel headers are documented to not compile #define _S390_BITOPS_H #include <sys/inotify.h> @@ -208,7 +213,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() : rescan_timer(0, "KSimpleDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KSimpleDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -222,7 +227,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -231,8 +236,8 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -268,7 +273,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -302,7 +307,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1213,7 +1218,7 @@ void KSimpleDirWatchPrivate::emitEvent(Entry* e, int event, const TQString &file else #ifdef Q_OS_UNIX path += "/" + fileName; -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //current drive is passed instead of / path += TQDir::currentDirPath().left(2) + "/" + fileName; #endif @@ -1367,7 +1372,7 @@ void KSimpleDirWatchPrivate::slotRescan() if ( timerRunning ) timer->start(freq); - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1416,7 +1421,7 @@ void KSimpleDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe) @@ -1502,10 +1507,14 @@ void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe) removeEntry(0,e->path,sub_entry); // <e> can be invalid here!! sub_entry->m_status = Normal; if (!useFAM(sub_entry)) + { #ifdef HAVE_INOTIFY if (!useINotify(sub_entry )) #endif + { useStat(sub_entry); + } + } } break; } @@ -1749,7 +1758,3 @@ KSimpleDirWatch::Method KSimpleDirWatch::internalMethod() #include "ksimpledirwatch.moc" #include "ksimpledirwatch_p.moc" - -//sven - -// vim: sw=2 ts=8 et diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h index 842a20dcf..41934aa26 100644 --- a/tdecore/ksimpledirwatch.h +++ b/tdecore/ksimpledirwatch.h @@ -65,7 +65,7 @@ class KSimpleDirWatchPrivate; */ class TDEIO_EXPORT KSimpleDirWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -289,5 +289,3 @@ class TDEIO_EXPORT KSimpleDirWatch : public TQObject }; #endif - -// vim: sw=3 et diff --git a/tdecore/ksimpledirwatch_p.h b/tdecore/ksimpledirwatch_p.h index cf1288064..7c6986d1a 100644 --- a/tdecore/ksimpledirwatch_p.h +++ b/tdecore/ksimpledirwatch_p.h @@ -23,7 +23,7 @@ */ class KSimpleDirWatchPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum entryStatus { Normal = 0, NonExistent }; diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp index 3f4886b8a..8de28f476 100644 --- a/tdecore/ksock.cpp +++ b/tdecore/ksock.cpp @@ -140,7 +140,7 @@ void TDESocket::enableRead( bool _state ) if ( !d->readNotifier ) { d->readNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - TQObject::connect( d->readNotifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRead(int) ) ); + TQObject::connect( d->readNotifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRead(int) ) ); } else d->readNotifier->setEnabled( true ); @@ -156,8 +156,8 @@ void TDESocket::enableWrite( bool _state ) if ( !d->writeNotifier ) { d->writeNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Write ); - TQObject::connect( d->writeNotifier, TQT_SIGNAL( activated(int) ), this, - TQT_SLOT( slotWrite(int) ) ); + TQObject::connect( d->writeNotifier, TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotWrite(int) ) ); } else d->writeNotifier->setEnabled( true ); @@ -357,7 +357,7 @@ bool TDEServerSocket::bindAndListen(bool suppressFailureMessages) sock = d->ks->fd(); - connect( d->ks->readNotifier(), TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( d->ks->readNotifier(), TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); return true; } diff --git a/tdecore/ksock.h b/tdecore/ksock.h index 31ca099e6..98b157dc4 100644 --- a/tdecore/ksock.h +++ b/tdecore/ksock.h @@ -22,10 +22,6 @@ #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX #include <tqobject.h> @@ -90,26 +86,26 @@ class TDEServerSocketPrivate; */ class TDECORE_EXPORT TDESocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a TDESocket with the provided file descriptor. * @param _sock The file descriptor to use. */ - TDESocket( int _sock ) KDE_DEPRECATED; + TDESocket( int _sock ) TDE_DEPRECATED; /** * Creates a socket and connects to a host. * @param _host The remote host to which to connect. * @param _port The port on the remote host. * @param timeOut The number of seconds waiting for connect (default 30). */ - TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED; + TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) TDE_DEPRECATED; /** * Connects to a UNIX domain socket. * @param _path The filename of the socket. */ - TDESocket( const char * _path ) KDE_DEPRECATED; + TDESocket( const char * _path ) TDE_DEPRECATED; /** * Destructor. Closes the socket if it is still open. @@ -154,7 +150,7 @@ public: * instead * @deprecated */ - unsigned long ipv4_addr() KDE_DEPRECATED; + unsigned long ipv4_addr() TDE_DEPRECATED; // BCI: remove in libtdecore.so.4 /** @@ -162,7 +158,7 @@ public: * Don't use this in new programs. Use KExtendedSocket::lookup * @deprecated */ - static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) KDE_DEPRECATED; + static bool initSockaddr(ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain = PF_INET) TDE_DEPRECATED; #endif signals: @@ -253,7 +249,7 @@ private: */ class TDECORE_EXPORT TDEServerSocket : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. @@ -284,7 +280,7 @@ public: * On error the socket will be closed. * @param suppressFailureMessages suppress warning messages generated if the socket cannot be opened. * @return true on success. false on error. - * @warning If suppressFailureMessages is TRUE future debugging may be made more difficult. Only set it + * @warning If suppressFailureMessages is true future debugging may be made more difficult. Only set it * if your application expects to bind to unavailable ports, e.g. while scanning for open ports in a range. */ bool bindAndListen(bool suppressFailureMessages = false); @@ -344,7 +340,7 @@ protected: private: // HACK #ifdef TDESOCKET_BINARY_COMPAT_HACK - KDE_EXPORT bool bindAndListen(); + TDE_EXPORT bool bindAndListen(); #endif // TDESOCKET_BINARY_COMPAT_HACK TDEServerSocket(const TDEServerSocket&); diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h index d3eb62d0d..f523fd980 100644 --- a/tdecore/ksockaddr.h +++ b/tdecore/ksockaddr.h @@ -45,7 +45,7 @@ class TDESocketAddressPrivate; */ class TDECORE_EXPORT TDESocketAddress: public TQObject { - Q_OBJECT + TQ_OBJECT protected: /** * Creates an empty class @@ -232,7 +232,7 @@ class KInetSocketAddressPrivate; */ class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress { - Q_OBJECT + TQ_OBJECT public: /** * Default constructor. Does nothing @@ -583,7 +583,7 @@ class KUnixSocketAddressPrivate; */ class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress { - Q_OBJECT + TQ_OBJECT public: /** * Default constructor diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index 6fac3179e..835cfd618 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -212,8 +212,8 @@ void KSocks::disable() KSocks *KSocks::self() { // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes. if (!_me) { - if (kapp) { - TDEConfigGroup cfg(kapp->config(), "Socks"); + if (tdeApp) { + TDEConfigGroup cfg(tdeApp->config(), "Socks"); _me = new KSocks(&cfg); } else { _disabled = true; diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h index b6967268c..28c2d89e2 100644 --- a/tdecore/kstaticdeleter.h +++ b/tdecore/kstaticdeleter.h @@ -82,7 +82,7 @@ public: * @param isArray tells the destructor to delete an array instead of an object * @deprecated See the other setObject variant. **/ - KDE_DEPRECATED type *setObject( type *obj, bool isArray = false) { + TDE_DEPRECATED type *setObject( type *obj, bool isArray = false) { deleteit = obj; globalReference = 0; array = isArray; diff --git a/tdecore/kstddirs.h b/tdecore/kstddirs.h deleted file mode 100644 index a009a750d..000000000 --- a/tdecore/kstddirs.h +++ /dev/null @@ -1,6 +0,0 @@ -// kstddirs.h is the old name, use #include <kstandarddirs.h> from now on -#ifdef KDE_NO_COMPAT -#error kstddirs.h is the old name, use #include <kstandarddirs.h> from now on -#else -#include <kstandarddirs.h> -#endif diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index 5f73c6f7e..e6fef9350 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -419,8 +419,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa return false; // Patterns like "Makefile*" - if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) { - if ( pattern[ 0 ] == (QChar)'*' ) + if ( pattern[ pattern_len - 1 ] == (TQChar)'*' && len + 1 >= pattern_len ) { + if ( pattern[ 0 ] == (TQChar)'*' ) { return filename.find(pattern.mid(1, pattern_len - 2)) != -1; } @@ -434,7 +434,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa } // Patterns like "*~", "*.extension" - if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len ) + if ( pattern[ 0 ] == (TQChar)'*' && len + 1 >= pattern_len ) { const TQChar *c1 = pattern.unicode() + pattern_len - 1; const TQChar *c2 = filename.unicode() + len - 1; diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h index f20963d63..2a75a2f7b 100644 --- a/tdecore/kstringhandler.h +++ b/tdecore/kstringhandler.h @@ -77,7 +77,7 @@ public: * @return the word, or an empty string if not found * @deprecated use TQString::section instead */ - static TQString word( const TQString &text , uint pos ) KDE_DEPRECATED; + static TQString word( const TQString &text , uint pos ) TDE_DEPRECATED; /** Returns a range of words from that string. * Ie: @@ -183,7 +183,7 @@ public: * @return the resulting string * @deprecated use TQString::leftJustify instead */ - static TQString ljust( const TQString &text , uint width ) KDE_DEPRECATED; + static TQString ljust( const TQString &text , uint width ) TDE_DEPRECATED; /** Right-justifies a string and returns a string at least 'width' characters * wide. @@ -194,7 +194,7 @@ public: * @return the resulting string * @deprecated use TQString::rightJustify instead */ - static TQString rjust( const TQString &text , uint width ) KDE_DEPRECATED; + static TQString rjust( const TQString &text , uint width ) TDE_DEPRECATED; /** Centers a string and returns a string at least 'width' characters * wide. @@ -432,7 +432,7 @@ private: /** * @deprecated Use matchFileName () instead. */ - static KDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern ) + static TDE_DEPRECATED bool matchFilename( const TQString& filename, const TQString& pattern ) { return matchFileName (filename, pattern); } diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp index d16d2e185..045695c07 100644 --- a/tdecore/ktempdir.cpp +++ b/tdecore/ktempdir.cpp @@ -49,10 +49,10 @@ #include "tdeglobal.h" #include "tdeapplication.h" -#include "kinstance.h" +#include "tdeinstance.h" #include "ktempdir.h" -#include "kstandarddirs.h" -#include "kprocess.h" +#include "tdestandarddirs.h" +#include "tdeprocess.h" #include <kdebug.h> #include "kde_file.h" diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index 3436cdabb..bf8a370fb 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -22,7 +22,7 @@ #include <ktimezones.h> #include <kdebug.h> #include <kmdcodec.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kstringhandler.h> #include <tdetempfile.h> @@ -245,7 +245,7 @@ TQDateTime KTimezone::convert(const KTimezone *newZone, const TQDateTime &dateTi ::setenv("TZ", newZone->name().utf8(), 1); tzset(); TQDateTime remoteTime; - remoteTime.setTime_t(utc, Qt::LocalTime); + remoteTime.setTime_t(utc, TQt::LocalTime); // Now restore things if (!originalZone) @@ -280,7 +280,7 @@ TQString KTimezone::name() const return m_name; } -int KTimezone::offset(Qt::TimeSpec basisSpec) const +int KTimezone::offset(TQt::TimeSpec basisSpec) const { char *originalZone = ::getenv("TZ"); @@ -290,7 +290,7 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const // Set the timezone and find out what time it is there compared to the basis. ::setenv("TZ", m_name.utf8(), 1); tzset(); - TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); + TQDateTime remoteTime = TQDateTime::currentDateTime(TQt::LocalTime); int offset = remoteTime.secsTo(basisTime); // Now restore things @@ -507,7 +507,7 @@ const KTimezone *KTimezones::local() // Compute the MD5 sum of /etc/localtime. KMD5 context(""); context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(f)); + context.update(f); TQIODevice::Offset referenceSize = f.size(); TQString referenceMd5Sum = context.hexDigest(); f.close(); @@ -526,7 +526,7 @@ const KTimezone *KTimezones::local() { // Only do the heavy lifting for file sizes which match. context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(f)); + context.update(f); candidateMd5Sum = context.hexDigest(); } f.close(); @@ -605,7 +605,7 @@ const KTimezone *KTimezones::local() for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it) { KTimezone *zone = it.data(); - int candidateOffset = QABS(zone->offset(Qt::LocalTime)); + int candidateOffset = TQABS(zone->offset(TQt::LocalTime)); if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset)) { // kdError() << "local=" << zone->name() << endl; diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h index 339cbf5bf..bcb1e7a99 100644 --- a/tdecore/ktimezones.h +++ b/tdecore/ktimezones.h @@ -156,7 +156,7 @@ public: * * @return offset in seconds. */ - int offset(Qt::TimeSpec basisSpec = Qt::UTC) const; + int offset(TQt::TimeSpec basisSpec = TQt::UTC) const; /** * Returns the offset of the given timezone to UTC at the given diff --git a/tdecore/kuniqueapp.h b/tdecore/kuniqueapp.h deleted file mode 100644 index d3ec22dd5..000000000 --- a/tdecore/kuniqueapp.h +++ /dev/null @@ -1,6 +0,0 @@ -// kuniqueapp.h is the old name. Use #include <kuniqueapplication.h> from now on -#ifdef KDE_NO_COMPAT -#error kuniqueapp.h is the old name. Use #include <kuniqueapplication.h> from now on -#else -#include <kuniqueapplication.h> -#endif diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 290355552..8122bb4bf 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -47,7 +47,7 @@ #include <tqtextcodec.h> #include <tqmutex.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # define KURL_ROOTDIR_PATH "C:/" #else # define KURL_ROOTDIR_PATH "/" @@ -386,7 +386,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de orig_pos = pos; } -#ifdef Q_WS_WIN // prepend drive letter if exists (js) +#ifdef TQ_WS_WIN // prepend drive letter if exists (js) if (orig_pos >= 2 && isalpha(path[0].latin1()) && path[1]==':') { result.prepend(TQString(path[0])+":"); } @@ -670,7 +670,7 @@ void KURL::parse( const TQString& _url, int encoding_hint ) // Node 1: Accept alpha or slash TQChar x = buf[pos++]; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN /* win32: accept <letter>: or <letter>:/ or <letter>:\ */ const bool alpha = isalpha((int)x); if (alpha && len<2) @@ -791,7 +791,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint ) // Node 1: Accept alpha or slash TQChar x = buf[pos++]; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN /* win32: accept <letter>: or <letter>:/ or <letter>:\ */ const bool alpha = isalpha((int)x); if (alpha && len<2) @@ -1608,7 +1608,7 @@ TQString KURL::prettyURL( int _trailing ) const } else { - u += trailingSlash( _trailing, lazy_encode( m_strPath ) ); + u += trailingSlash( _trailing, lazy_encode( m_strPath, false ) ); } if (!m_strQuery_encoded.isNull()) @@ -1628,7 +1628,7 @@ TQString KURL::prettyURL( int _trailing, AdjustementFlags _flags) const TQString u = prettyURL(_trailing); if (_flags & StripFileProtocol && u.startsWith("file://")) { u.remove(0, 7); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return TQDir::convertSeparators(u); #endif } @@ -2378,21 +2378,17 @@ int KURL::uriMode() const KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol) { + KURL::URIMode mode = Auto; #ifndef KDE_QT_ONLY - KURL::URIMode mode = Auto; - if (protocol == fileProt) - return URL; - if (TDEGlobal::_instance) - mode = KProtocolInfo::uriParseMode(protocol); - if (mode == Auto ) { -#else - KURL::URIMode mode = Auto; + if (protocol == fileProt) + return URL; + if (TDEGlobal::_instance) + mode = KProtocolInfo::uriParseMode(protocol); #endif - if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI; - else if ( protocol == "mailto" ) mode = Mailto; - else mode = URL; -#ifndef KDE_QT_ONLY - } -#endif - return mode; + if (mode == Auto ) { + if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI; + else if ( protocol == "mailto" ) mode = Mailto; + else mode = URL; + } + return mode; } diff --git a/tdecore/kurl.h b/tdecore/kurl.h index 740c8a0df..ca30a3b0a 100644 --- a/tdecore/kurl.h +++ b/tdecore/kurl.h @@ -128,7 +128,7 @@ class TDECORE_EXPORT KURL { public: /** - * Flags to choose how file: URLs are treated when creating their QString + * Flags to choose how file: URLs are treated when creating their TQString * representation with prettyURL(int,AdjustementFlags) * * However it is recommended to use pathOrURL() instead of this variant of prettyURL() @@ -834,7 +834,7 @@ public: * * @see isValid() */ - KDE_DEPRECATED bool isMalformed() const { return !isValid(); } + TDE_DEPRECATED bool isMalformed() const { return !isValid(); } /** * @brief Tests if the file is local @@ -1468,7 +1468,7 @@ public: * * @deprecated Use equals() instead. */ - bool cmp( const KURL &u, bool ignore_trailing = false ) const KDE_DEPRECATED; + bool cmp( const KURL &u, bool ignore_trailing = false ) const TDE_DEPRECATED; /** * @brief Compares this URL with another one diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 07e669dfd..51346cf66 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -150,7 +150,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T return false; // Couldn't decode the URLs } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS bool KURLDrag::decode( TQStringList const &e, KURL::List &uris ) { TQStringList::ConstIterator end(e.end()); diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h index ccaf86e1a..a578ff74c 100644 --- a/tdecore/kurldrag.h +++ b/tdecore/kurldrag.h @@ -52,7 +52,7 @@ public: * @param urls the list of URLs * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop, * but should be 0 when copying to the clipboard - * @param name the name of the QObject + * @param name the name of the TQObject */ KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ); /** @@ -62,7 +62,7 @@ public: * @param metaData a map containing meta data * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop, * but should be 0 when copying to the clipboard - * @param name the name of the QObject + * @param name the name of the TQObject * @see metaData() */ KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData, @@ -82,13 +82,13 @@ public: /** * @deprecated Is equivalent with "new KURLDrag(urls, dragSource, name)". */ - static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED; + static KURLDrag * newDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED; /** * @deprecated Is equivalent with "new KURLDrag(urls, metaData, dragSource, name)". */ static KURLDrag * newDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData, - TQWidget* dragSource = 0, const char * name = 0 ) KDE_DEPRECATED; + TQWidget* dragSource = 0, const char * name = 0 ) TDE_DEPRECATED; /** * Meta-data to associate with those URLs. @@ -133,7 +133,7 @@ public: */ static KURL stringToUrl(const TQCString &s); -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS /** * Convenience method that decodes the contents of @p e * into a list of KURLs for Qt versions without a MIME clipboard. @@ -152,7 +152,7 @@ protected: * @deprecated Use a KURLDrag constructor with a KURL::List */ KURLDrag( const TQStrList & urls, const TQMap<TQString,TQString>& metaData, - TQWidget * dragSource, const char* name ) KDE_DEPRECATED; + TQWidget * dragSource, const char* name ) TDE_DEPRECATED; private: void init(const KURL::List &urls); diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h index e85e03446..677293443 100644 --- a/tdecore/kvmallocator.h +++ b/tdecore/kvmallocator.h @@ -80,7 +80,7 @@ public: * @deprecated * @see copyBlock */ - void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED; + void copy(void *dest, Block *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED; /** * Copy @p length bytes from normal memory at address @p src to @@ -98,7 +98,7 @@ public: * @deprecated * @see copyBlock */ - void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) KDE_DEPRECATED; + void copy(Block *dest, void *src, int _offset = 0, size_t length = 0) TDE_DEPRECATED; /** * Map a virtual memory block in memory diff --git a/tdecore/kxerrorhandler.cpp b/tdecore/kxerrorhandler.cpp index 3a8524bed..ce9197bf6 100644 --- a/tdecore/kxerrorhandler.cpp +++ b/tdecore/kxerrorhandler.cpp @@ -23,7 +23,7 @@ */ #include <tqwidget.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "kxerrorhandler.h" #include <assert.h> diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp index 116c74d1c..37c15bcf9 100644 --- a/tdecore/kxmessages.cpp +++ b/tdecore/kxmessages.cpp @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> -#ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E +#ifdef TQ_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E #include <X11/Xlib.h> #include <kdebug.h> @@ -42,8 +42,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P ) { if( accept_broadcast_P != NULL ) { - ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events - kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask + ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask accept_atom1 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom2 = accept_atom1; } @@ -59,8 +59,8 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P, bool { if( accept_broadcast_P != NULL ) { - ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events - kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask + ( void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); // i.e. PropertyChangeMask accept_atom2 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom1 = obsolete_P ? accept_atom2 : XInternAtom( tqt_xdisplay(), TQCString( accept_broadcast_P ) + "_BEGIN", false ); diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h index 5caec19fc..d3787f6bb 100644 --- a/tdecore/kxmessages.h +++ b/tdecore/kxmessages.h @@ -30,11 +30,7 @@ DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> class TQString; @@ -52,7 +48,7 @@ class KXMessagesPrivate; class TDECORE_EXPORT KXMessages : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Creates an instance which will receive X messages. diff --git a/tdecore/libintl.cpp b/tdecore/libintl.cpp index 5d2f6a086..c7b8c7ee6 100644 --- a/tdecore/libintl.cpp +++ b/tdecore/libintl.cpp @@ -260,8 +260,8 @@ hash_string (const char *str_param) while (*str != '\0') { hval <<= 4; - hval += (unsigned long) *str++; - g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); + hval += (unsigned char) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); if (g != 0) { hval ^= g >> (HASHWORDBITS - 8); diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck index e18ee438f..d5962f37a 100644 --- a/tdecore/libqt-mt.nmcheck +++ b/tdecore/libqt-mt.nmcheck @@ -4,7 +4,7 @@ Q*::* qt_* -# these should preferably go in some namespace in Qt4 +# these should preferably go in some namespace tqDebug tqFatal tqWarning diff --git a/tdecore/libtdecore.nmcheck b/tdecore/libtdecore.nmcheck index 7c017a6e4..92ec3ff8f 100644 --- a/tdecore/libtdecore.nmcheck +++ b/tdecore/libtdecore.nmcheck @@ -44,6 +44,8 @@ operator>> operator<< qt_qclipboard_bailout_hack kasciistricmp +kasciitolower +kasciitoupper # from libtldl lt_dl* diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c index 8f9fbb79b..00b1e7f61 100644 --- a/tdecore/malloc/malloc.c +++ b/tdecore/malloc/malloc.c @@ -16,7 +16,6 @@ int kde_malloc_is_used = 0; #define USE_MALLOC_LOCK #define INLINE __inline__ /*#define INLINE*/ -#define USE_MEMCPY 0 #define MMAP_CLEARS 1 /* @@ -193,8 +192,6 @@ int kde_malloc_is_used = 0; __STD_C derived from C compiler defines WIN32 NOT defined - HAVE_MEMCPY defined - USE_MEMCPY 1 if HAVE_MEMCPY is defined HAVE_MMAP defined as 1 MMAP_CLEARS 1 HAVE_MREMAP 0 unless linux defined @@ -563,34 +560,6 @@ extern "C" { #endif /* USE_DL_PREFIX */ -/* - HAVE_MEMCPY should be defined if you are not otherwise using - ANSI STD C, but still have memcpy and memset in your C library - and want to use them in calloc and realloc. Otherwise simple - macro versions are defined below. - - USE_MEMCPY should be defined as 1 if you actually want to - have memset and memcpy called. People report that the macro - versions are faster than libc versions on some systems. - - Even if USE_MEMCPY is set to 1, loops to copy/clear small chunks - (of <= 36 bytes) are manually unrolled in realloc and calloc. -*/ - -/* If it's available it's defined in config.h. */ -/* #define HAVE_MEMCPY */ - -#ifndef USE_MEMCPY -#ifdef HAVE_MEMCPY -#define USE_MEMCPY 1 -#else -#define USE_MEMCPY 0 -#endif -#endif - - -#if (__STD_C || defined(HAVE_MEMCPY)) - #ifdef WIN32 /* On Win32 memset and memcpy are already declared in windows.h */ #else @@ -602,7 +571,6 @@ Void_t* memset(); Void_t* memcpy(); #endif #endif -#endif /* MALLOC_FAILURE_ACTION is the action to take before "return 0" when @@ -778,7 +746,7 @@ extern Void_t* sbrk(); # ifdef _SC_PAGE_SIZE # define malloc_getpagesize sysconf(_SC_PAGE_SIZE) # else -# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) +# if defined(BSD) || defined(HAVE_GETPAGESIZE) extern size_t getpagesize(); # define malloc_getpagesize getpagesize() # else @@ -1747,64 +1715,6 @@ int public_mALLOPt(int p, int v) { #endif - - -/* ------------- Optional versions of memcopy ---------------- */ - - -#if USE_MEMCPY - -/* - Note: memcpy is ONLY invoked with non-overlapping regions, - so the (usually slower) memmove is not needed. -*/ - -#define MALLOC_COPY(dest, src, nbytes) memcpy(dest, src, nbytes) -#define MALLOC_ZERO(dest, nbytes) memset(dest, 0, nbytes) - -#else /* !USE_MEMCPY */ - -/* Use Duff's device for good zeroing/copying performance. */ - -#define MALLOC_ZERO(charp, nbytes) \ -do { \ - INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp); \ - unsigned long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T); \ - long mcn; \ - if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ - switch (mctmp) { \ - case 0: for(;;) { *mzp++ = 0; \ - case 7: *mzp++ = 0; \ - case 6: *mzp++ = 0; \ - case 5: *mzp++ = 0; \ - case 4: *mzp++ = 0; \ - case 3: *mzp++ = 0; \ - case 2: *mzp++ = 0; \ - case 1: *mzp++ = 0; if(mcn <= 0) break; mcn--; } \ - } \ -} while(0) - -#define MALLOC_COPY(dest,src,nbytes) \ -do { \ - INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src; \ - INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest; \ - unsigned long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T); \ - long mcn; \ - if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ - switch (mctmp) { \ - case 0: for(;;) { *mcdst++ = *mcsrc++; \ - case 7: *mcdst++ = *mcsrc++; \ - case 6: *mcdst++ = *mcsrc++; \ - case 5: *mcdst++ = *mcsrc++; \ - case 4: *mcdst++ = *mcsrc++; \ - case 3: *mcdst++ = *mcsrc++; \ - case 2: *mcdst++ = *mcsrc++; \ - case 1: *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; } \ - } \ -} while(0) - -#endif - /* ------------------ MMAP support ------------------ */ @@ -4006,9 +3916,9 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; ncopies = copysize / sizeof(INTERNAL_SIZE_T); assert(ncopies >= 3); - if (ncopies > 9) - MALLOC_COPY(d, s, copysize); - + if (ncopies > 9) { + memcpy(d, s, copysize); + } else { *(d+0) = *(s+0); *(d+1) = *(s+1); @@ -4106,7 +4016,7 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; /* Must alloc, copy, free. */ newmem = mALLOc(nb - MALLOC_ALIGN_MASK); if (newmem != 0) { - MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ); + memcpy(newmem, oldmem, oldsize - 2*SIZE_SZ); fREe(oldmem); } } @@ -4264,9 +4174,9 @@ Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size; nclears = clearsize / sizeof(INTERNAL_SIZE_T); assert(nclears >= 3); - if (nclears > 9) - MALLOC_ZERO(d, clearsize); - + if (nclears > 9) { + memset(d, 0, clearsize); + } else { *(d+0) = 0; *(d+1) = 0; @@ -4290,7 +4200,7 @@ Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size; { d = (INTERNAL_SIZE_T*)mem; clearsize = chunksize(p) - 2 * SIZE_SZ; - MALLOC_ZERO(d, clearsize); + memset(d, 0, clearsize); } #endif } @@ -4396,7 +4306,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_ remainder_size = chunksize(p); if (opts & 0x2) { /* optionally clear the elements */ - MALLOC_ZERO(mem, remainder_size - SIZE_SZ - array_size); + memset(mem, 0, remainder_size - SIZE_SZ - array_size); } /* If not provided, allocate the pointer array as final part of chunk */ diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp index 0c072752c..0ea43178d 100644 --- a/tdecore/netsupp.cpp +++ b/tdecore/netsupp.cpp @@ -49,7 +49,7 @@ extern int h_errno; #endif -#include <kdemacros.h> +#include <tdemacros.h> #if !defined(kde_sockaddr_in6) /* @@ -1233,5 +1233,5 @@ int inet_pton(int af, const char *cp, void *buf) namespace KDE { /** @internal */ - extern const int KDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton; + extern const int TDE_EXPORT resolverFlags = KRF_getaddrinfo | KRF_resolver | KRF_afinet6 | KRF_inet_ntop | KRF_inet_pton; } diff --git a/tdecore/netwm.cpp b/tdecore/netwm.cpp index c1e876eeb..1e0670333 100644 --- a/tdecore/netwm.cpp +++ b/tdecore/netwm.cpp @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqapplication.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "netwm.h" @@ -1602,7 +1602,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom ) } void NETRootInfo::setActiveWindow(Window window) { - setActiveWindow( window, FromUnknown, GET_QT_X_USER_TIME(), None ); + setActiveWindow( window, FromUnknown, get_tqt_x_user_time(), None ); } void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src, @@ -1811,7 +1811,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y void NETRootInfo::restackRequest(Window window, Window above, int detail) { - restackRequest( window, FromTool, above, detail, GET_QT_X_USER_TIME() ); + restackRequest( window, FromTool, above, detail, get_tqt_x_user_time() ); } void NETRootInfo::restackRequest(Window window, RequestSource src, Window above, int detail, Time timestamp ) diff --git a/tdecore/netwm.h b/tdecore/netwm.h index ca8ed5139..bdfa67a20 100644 --- a/tdecore/netwm.h +++ b/tdecore/netwm.h @@ -29,7 +29,7 @@ #include "tdelibs_export.h" #include <tqwidget.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> @@ -109,7 +109,7 @@ public: to the first element of the properties array in the above constructor. **/ NETRootInfo(Display *display, Window supportWindow, const char *wmName, - unsigned long properties, int screen = -1, bool doActivate = true) KDE_DEPRECATED; + unsigned long properties, int screen = -1, bool doActivate = true) TDE_DEPRECATED; /** Clients should use this constructor to create a NETRootInfo object, which @@ -258,7 +258,7 @@ public: @see NET::Property **/ - unsigned long supported() const KDE_DEPRECATED; + unsigned long supported() const TDE_DEPRECATED; /** Returns an array of Window id's, which contain all managed windows. @@ -727,7 +727,7 @@ protected: @param window the id of the window to activate **/ - virtual KDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); } + virtual TDE_DEPRECATED void changeActiveWindow(Window window) { Q_UNUSED(window); } /** A Window Manager should subclass NETRootInfo and reimplement this function @@ -1029,7 +1029,7 @@ public: @see NET::Property **/ - unsigned long properties() const KDE_DEPRECATED; + unsigned long properties() const TDE_DEPRECATED; /** Returns the icon geometry. @@ -1083,7 +1083,7 @@ public: @return the type of the window **/ - WindowType windowType() const KDE_DEPRECATED; + WindowType windowType() const TDE_DEPRECATED; /** Returns the name of the window in UTF-8 format. diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 3e9462922..08f899c8a 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003-2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -93,12 +93,7 @@ void TDEBufferedSocket::close() } } -#ifdef USE_QT3 TQ_LONG TDEBufferedSocket::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 TDEBufferedSocket::bytesAvailable() const -#endif { if (!d->input) return KStreamSocket::bytesAvailable(); @@ -118,7 +113,7 @@ TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -131,13 +126,13 @@ TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) resetError(); return d->input->consumeBuffer(data, maxlen); } - return KStreamSocket::tqreadBlock(data, maxlen); + return KStreamSocket::readBlock(data, maxlen); } -TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); - return tqreadBlock(data, maxlen); + return readBlock(data, maxlen); } TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) @@ -162,7 +157,7 @@ TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre return peekBlock(data, maxlen); } -TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG len) { if (state() != Connected) { @@ -189,14 +184,14 @@ TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return d->output->feedBuffer(data, len); } - return KStreamSocket::tqwriteBlock(data, len); + return KStreamSocket::writeBlock(data, len); } -TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, +TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen, const TDESocketAddress&) { // ignore the third parameter - return tqwriteBlock(data, maxlen); + return writeBlock(data, maxlen); } void TDEBufferedSocket::enableRead(bool enable) @@ -213,7 +208,7 @@ void TDEBufferedSocket::enableRead(bool enable) if (enable && state() != Connected && d->input && !d->input->isEmpty()) // this means the buffer is still dirty // allow the signal to be emitted - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); } void TDEBufferedSocket::enableWrite(bool enable) @@ -284,12 +279,7 @@ TDEIOBufferBase* TDEBufferedSocket::outputBuffer() return d->output; } -#ifdef USE_QT3 TQ_ULONG TDEBufferedSocket::bytesToWrite() const -#endif -#ifdef USE_QT4 -qint64 TDEBufferedSocket::bytesToWrite() const -#endif { if (!d->output) return 0; @@ -368,7 +358,7 @@ void TDEBufferedSocket::slotReadActivity() { // buffer isn't empty // keep emitting signals till it is - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); emit readyRead(); } } diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 60ad3e81d..641d35cd1 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago@kde.org> * * @@ -57,7 +57,7 @@ class TDEBufferedSocketPrivate; */ class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket { - Q_OBJECT + TQ_OBJECT public: /** @@ -99,12 +99,7 @@ public: /** * Make use of the buffers. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Make use of buffers. @@ -114,7 +109,7 @@ public: /** * Reads data from the socket. Make use of buffers. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload @@ -122,7 +117,7 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. @@ -140,7 +135,7 @@ public: /** * Writes data to the socket. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload @@ -148,7 +143,7 @@ public: * * The @p to parameter is discarded. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Catch changes. @@ -183,12 +178,7 @@ public: /** * Returns the length of the output buffer. */ -#ifdef USE_QT3 virtual TQ_ULONG bytesToWrite() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesToWrite() const; -#endif /** * Closes the socket and discards any output data that had been buffered @@ -208,8 +198,6 @@ public: */ TQCString readLine(); - // KDE4: make virtual, add timeout to match the Qt4 signature - // and move to another class up the hierarchy /** * Blocks until the connection is either established, or completely * failed. @@ -255,12 +243,7 @@ public: * which required a call to reset() in order to be able to connect again * using the same device. This is not necessary in TDEBufferedSocket any more. */ -#ifdef USE_QT3 inline void reset() -#endif -#ifdef USE_QT4 - inline bool reset() -#endif { closeNow(); } }; diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index eb8e4883b..25eb34d8e 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -48,16 +48,8 @@ public: }; KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name) : -#ifdef USE_QT4 -#else // USE_QT4 - TQObject(parent, name), -#endif // USE_QT4 - d(new KClientSocketBasePrivate) -{ -#ifdef USE_QT4 - setParent(parent); - setObjectName(name); -#endif // USE_QT4 + TQObject(parent, name), d(new KClientSocketBasePrivate) +{ d->state = Idle; d->enableRead = true; d->enableWrite = false; @@ -152,10 +144,10 @@ bool KClientSocketBase::lookup() // don't restart the lookups if they had succeeded and // the input values weren't changed - TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); - TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); if (d->localResolver.status() <= 0) d->localResolver.start(); @@ -172,7 +164,7 @@ bool KClientSocketBase::lookup() if (blocking()) lookupFinishedSlot(); else - TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot())); } else { @@ -286,12 +278,7 @@ void KClientSocketBase::close() } // This function is unlike all the others because it is const -#ifdef USE_QT3 TQ_LONG KClientSocketBase::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 KClientSocketBase::bytesAvailable() const -#endif { return socketDevice()->bytesAvailable(); } @@ -311,10 +298,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen) { resetError(); - TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen); if (retval == -1) { copyError(); @@ -323,10 +310,10 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { resetError(); - TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from); if (retval == -1) { copyError(); @@ -359,10 +346,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len) { resetError(); - TQ_LONG retval = socketDevice()->tqwriteBlock(data, len); + TQ_LONG retval = socketDevice()->writeBlock(data, len); if (retval == -1) { copyError(); @@ -371,10 +358,10 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l return retval; } -TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); - TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to); + TQ_LONG retval = socketDevice()->writeBlock(data, len, to); if (retval == -1) { copyError(); @@ -440,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot() if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup) return; - TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); - TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); if (d->peerResolver.status() < 0 || d->localResolver.status() < 0) { setState(Idle); // backtrack @@ -466,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableRead); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -475,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableWrite); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 27da219a9..a6f9eaf92 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -32,10 +32,6 @@ #include "kresolver.h" #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define USE_QT4 -#endif // Q_MOC_RUN - namespace KNetwork { class KClientSocketBasePrivate; @@ -50,14 +46,9 @@ class KClientSocketBasePrivate; * * @author Thiago Macieira <thiago.macieira@kdemail.net> */ -class TDECORE_EXPORT KClientSocketBase : -#ifdef USE_QT4 -#else // USE_QT4 -public TQObject, -#endif // USE_QT4 -public KActiveSocketBase +class TDECORE_EXPORT KClientSocketBase : public TQObject, public KActiveSocketBase { - Q_OBJECT + TQ_OBJECT public: @@ -281,7 +272,7 @@ public: * * You should not call this function; instead, use @ref connect */ - virtual inline bool open(TQ_OpenMode) + virtual inline bool open(int) { return connect(); } /** @@ -302,12 +293,7 @@ public: * Returns the number of bytes available on this socket. * Reimplemented from TDESocketBase. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Waits for more data. Reimplemented from TDESocketBase. @@ -317,13 +303,13 @@ public: /** * Reads data from a socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload * Reads data from a socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data from the socket. Reimplemented from TDESocketBase. @@ -339,13 +325,13 @@ public: /** * Writes data to the socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload * Writes data to the socket. Reimplemented from TDESocketBase. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Returns the local socket address. Reimplemented from TDESocketBase. diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp index ac8e526ee..5fa631560 100644 --- a/tdecore/network/kdatagramsocket.cpp +++ b/tdecore/network/kdatagramsocket.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2004 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -52,11 +52,11 @@ KDatagramSocket::KDatagramSocket(TQObject* parent, const char *name) localResolver().setFlags(KResolver::Passive); - // TQObject::connect(localResolver(), TQT_SIGNAL(finished(KResolverResults)), - // this, TQT_SLOT(lookupFinishedLocal())); - TQObject::connect(&peerResolver(), TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedPeer())); - TQObject::connect(this, TQT_SIGNAL(hostFound()), this, TQT_SLOT(lookupFinishedLocal())); + // TQObject::connect(localResolver(), TQ_SIGNAL(finished(KResolverResults)), + // this, TQ_SLOT(lookupFinishedLocal())); + TQObject::connect(&peerResolver(), TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedPeer())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), this, TQ_SLOT(lookupFinishedLocal())); } KDatagramSocket::~KDatagramSocket() @@ -156,7 +156,7 @@ KDatagramPacket KDatagramSocket::receive() TDESocketAddress address; // now do the reading - size = tqreadBlock(data.data(), size, address); + size = readBlock(data.data(), size, address); if (size < 0) // error has been set return KDatagramPacket(); @@ -167,10 +167,10 @@ KDatagramPacket KDatagramSocket::receive() TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet) { - return tqwriteBlock(packet.data(), packet.size(), packet.address()); + return writeBlock(packet.data(), packet.size(), packet.address()); } -TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) +TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { if (to.family() != AF_UNSPEC) { @@ -179,7 +179,7 @@ TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDES // error handling will happen below socketDevice()->create(to.family(), SOCK_DGRAM, 0); } - return KClientSocketBase::tqwriteBlock(data, len, to); + return KClientSocketBase::writeBlock(data, len, to); } void KDatagramSocket::lookupFinishedLocal() @@ -265,7 +265,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyRead()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -274,7 +274,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyWrite()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h index fd12a0d97..b99938e8b 100644 --- a/tdecore/network/kdatagramsocket.h +++ b/tdecore/network/kdatagramsocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -179,7 +179,7 @@ class KDatagramSocketPrivate; */ class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase { - Q_OBJECT + TQ_OBJECT public: @@ -223,7 +223,7 @@ public: * * Connecting means only to designate the given address as the default * destination address for datagrams sent without destination addresses - * ( tqwriteBlock(const char *, TQ_ULONG) ). + * ( writeBlock(const char *, TQ_ULONG) ). * * @note Calling connect will not cause the socket to be bound. You have * to call @ref bind explicitly. @@ -241,7 +241,7 @@ public: /** * Writes data to the socket. Reimplemented from KClientSocketBase. */ - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Receives one datagram from the stream. The reading process is guaranteed diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp index 0c4947554..980fa39d5 100644 --- a/tdecore/network/khttpproxysocketdevice.cpp +++ b/tdecore/network/khttpproxysocketdevice.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -182,7 +182,7 @@ bool KHttpProxySocketDevice::parseServerReply() if (!d->request.isEmpty()) { // send request - TQ_LONG written = tqwriteBlock(d->request, d->request.length()); + TQ_LONG written = writeBlock(d->request, d->request.length()); if (written < 0) { tqDebug("KHttpProxySocketDevice: would block writing request!"); @@ -230,7 +230,7 @@ bool KHttpProxySocketDevice::parseServerReply() { // no, headers not yet finished... // consume data from socket - tqreadBlock(buf.data(), avail); + readBlock(buf.data(), avail); d->reply += buf.data(); setError(IO_ConnectError, InProgress); return true; @@ -241,7 +241,7 @@ bool KHttpProxySocketDevice::parseServerReply() d->reply += fullHeaders.mid(d->reply.length(), index + 4); // consume from socket - tqreadBlock(buf.data(), index + 4); + readBlock(buf.data(), index + 4); } else { diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h index dc5faef93..f6b05ef9e 100644 --- a/tdecore/network/khttpproxysocketdevice.h +++ b/tdecore/network/khttpproxysocketdevice.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/knetworkinterface.h b/tdecore/network/knetworkinterface.h index d4eb43f08..8b63dc784 100644 --- a/tdecore/network/knetworkinterface.h +++ b/tdecore/network/knetworkinterface.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 6ec0c5aba..f80b9209e 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003-2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -550,7 +550,7 @@ void KResolver::emitFinished() emit finished(d->results); if (p && d->deleteWhenDone) - deleteLater(); // in QObject + deleteLater(); // in TQObject } TQString KResolver::errorString(int errorcode, int syserror) @@ -591,7 +591,7 @@ KResolverResults KResolver::resolve(const TQString& host, const TQString& service, int flags, int families) { - KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver"); + KResolver qres(host, service, tqApp, "synchronous KResolver"); qres.setFlags(flags); qres.setFamily(families); qres.start(); @@ -603,8 +603,8 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot, const TQString& host, const TQString& service, int flags, int families) { - KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver"); - TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); + KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver"); + TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), userObj, userSlot); qres->setFlags(flags); qres->setFamily(families); qres->d->deleteWhenDone = true; // this is the only difference from the example code diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index 3de19acd3..51e605704 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; coding: utf-8; -*- +/* * Copyright (C) 2003,2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -294,7 +294,7 @@ class KResolverPrivate; */ class TDECORE_EXPORT KResolver: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -759,7 +759,7 @@ public: * * \code * KResolver* qres = new KResolver(host, service); - * TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), + * TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), * userObj, userSlot); * qres->setFlags(flags); * qres->setFamily(families); @@ -768,7 +768,7 @@ public: * * You should use it like this in your code: * \code - * KResolver::resolveAsync(myObj, TQT_SLOT(mySlot(KResolverResults)), host, service); + * KResolver::resolveAsync(myObj, TQ_SLOT(mySlot(KResolverResults)), host, service); * \endcode * * @param userObj the object whose slot @p userSlot we will connect diff --git a/tdecore/network/kresolver_p.h b/tdecore/network/kresolver_p.h index 9cc139458..896fe536f 100644 --- a/tdecore/network/kresolver_p.h +++ b/tdecore/network/kresolver_p.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003-2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -48,7 +48,6 @@ extern TQMutex getXXbyYYmutex; #endif /* some systems have the functions, but don't declare them */ -#ifndef __OpenBSD__ #if defined(HAVE_GETSERVBYNAME_R) && !HAVE_DECL_GETSERVBYNAME_R extern "C" { struct servent; @@ -70,7 +69,6 @@ extern "C" { struct protoent** result); } #endif -#endif /* decide whether res_init is thread-safe or not */ #if defined(__GLIBC__) @@ -208,7 +206,7 @@ namespace KNetwork KResolverManager(); public: - static KResolverManager* manager() KDE_NO_EXPORT; // creates and returns the global manager + static KResolverManager* manager() TDE_NO_EXPORT; // creates and returns the global manager // destructor ~KResolverManager(); diff --git a/tdecore/network/kresolvermanager.cpp b/tdecore/network/kresolvermanager.cpp index 7801a4295..61f8290e5 100644 --- a/tdecore/network/kresolvermanager.cpp +++ b/tdecore/network/kresolvermanager.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003-2005 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 96519d1aa..ed083f541 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2004 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -45,7 +45,7 @@ #include "kdebug.h" #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeapplication.h" #include "kresolver.h" @@ -199,7 +199,7 @@ namespace # elif defined(HAVE_GETHOSTBYNAME_R) && (!defined(AF_INET6) || !defined(HAVE_GETHOSTBYNAME2)) # define USE_GETHOSTBYNAME_R # elif defined(HAVE_GETHOSTBYNAME2) -# define USE_GETHOSTBYNAME2) +# define USE_GETHOSTBYNAME2 # else # define USE_GETHOSTBYNAME # endif diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h index 95d21bbc0..92d15892a 100644 --- a/tdecore/network/kresolverstandardworkers_p.h +++ b/tdecore/network/kresolverstandardworkers_p.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -39,7 +39,7 @@ namespace KNetwork { namespace Internal { - extern void initStandardWorkers() KDE_NO_EXPORT; + extern void initStandardWorkers() TDE_NO_EXPORT; /** * @internal diff --git a/tdecore/network/kresolverworkerbase.cpp b/tdecore/network/kresolverworkerbase.cpp index f149e2dda..5f39e4975 100644 --- a/tdecore/network/kresolverworkerbase.cpp +++ b/tdecore/network/kresolverworkerbase.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2004 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/kresolverworkerbase.h b/tdecore/network/kresolverworkerbase.h index e0a676ced..94cb04a84 100644 --- a/tdecore/network/kresolverworkerbase.h +++ b/tdecore/network/kresolverworkerbase.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2004 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp index fc172c2ff..6dffb1840 100644 --- a/tdecore/network/kreverseresolver.cpp +++ b/tdecore/network/kreverseresolver.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h index 4a3fa4bdd..41dc38e90 100644 --- a/tdecore/network/kreverseresolver.h +++ b/tdecore/network/kreverseresolver.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -49,7 +49,7 @@ class KReverseResolverPrivate; */ class TDECORE_EXPORT KReverseResolver: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index e04d74b08..0cfba8fa5 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -61,15 +61,15 @@ public: TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); } TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); d->resolver.setServiceName(service); } @@ -77,8 +77,8 @@ TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service, TQObject* parent, const char* name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); setAddress(node, service); } @@ -403,8 +403,8 @@ bool TDEServerSocket::doListen() } // set up ready accept signal - TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(readyAccept())); + TQObject::connect(socketDevice()->readNotifier(), TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(readyAccept())); d->state = TDEServerSocketPrivate::Listening; return true; } diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index edb86d0b2..637dc92d0 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago@kde.org> * * @@ -50,8 +50,8 @@ class TDEServerSocketPrivate; * \code * TQString service = "http"; * TDEServerSocket *ss = new TDEServerSocket(service); - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * \endcode * @@ -84,8 +84,8 @@ class TDEServerSocketPrivate; * if( !found ) { * // Couldn't connect to any port. * } else { - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * } * \endcode @@ -106,7 +106,7 @@ class TDEServerSocketPrivate; */ class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index 69c674438..f4388251f 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2004 Thiago Macieira <thiago.macieira@kdemail.net> * * This library is free software; you can redistribute it and/or @@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketA return 0; } -TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddr return retval; } -TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len) { - return tqwriteBlock(data, len, TDESocketAddress()); + return writeBlock(data, len, TDESocketAddress()); } -TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) @@ -467,7 +467,7 @@ void KSocksSocketDevice::initSocks() if (init) return; - if (kapp == 0L) + if (tdeApp == 0L) return; // no TDEApplication, so don't initialise // this should, however, test for TDEInstance diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h index 2a83c0adc..760038143 100644 --- a/tdecore/network/ksockssocketdevice.h +++ b/tdecore/network/ksockssocketdevice.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2004 Thiago Macieira <thiago.macieira@kdemail.net> * * This library is free software; you can redistribute it and/or @@ -83,8 +83,8 @@ public: /** * Overrides reading. */ - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen); - virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Overrides peeking. @@ -95,8 +95,8 @@ public: /** * Overrides writing. */ - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len); - virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Overrides getting socket address. diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index 419873d4f..732de02a4 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2005 Thiago Macieira <thiago@kde.org> * * This library is free software; you can redistribute it and/or @@ -226,7 +226,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv); - TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(dns, TQ_SIGNAL(resultsReady()), this, TQ_SLOT(dnsResultsReady())); } void KSrvResolverWorker::dnsResultsReady() @@ -242,7 +242,7 @@ namespace KNetwork namespace Internal { - void initSrvWorker() KDE_NO_EXPORT; + void initSrvWorker() TDE_NO_EXPORT; void initSrvWorker() { if (getenv("TDE_NO_SRV") != NULL) diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h index a9aba3d35..efb4c45f9 100644 --- a/tdecore/network/ksrvresolverworker_p.h +++ b/tdecore/network/ksrvresolverworker_p.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2005 Thiago Macieira <thiago@kde.org> * * This library is free software; you can redistribute it and/or @@ -41,7 +41,7 @@ namespace KNetwork class KSrvResolverWorker: public TQObject, public KNetwork::KResolverWorkerBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp index 700f9f53f..a36f8cc78 100644 --- a/tdecore/network/kstreamsocket.cpp +++ b/tdecore/network/kstreamsocket.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -61,7 +61,7 @@ KStreamSocket::KStreamSocket(const TQString& node, const TQString& service, setSocketOptions(socketOptions() & ~Blocking); - TQObject::connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutSlot())); + TQObject::connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutSlot())); } KStreamSocket::~KStreamSocket() @@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service) // connection hasn't started yet if (!blocking()) { - QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), TQ_SLOT(hostFoundSlot())); return lookup(); } @@ -196,10 +196,10 @@ bool KStreamSocket::connect(const KResolverEntry& entry) void KStreamSocket::hostFoundSlot() { - QObject::disconnect(this, TQT_SLOT(hostFoundSlot())); + TQObject::disconnect(this, TQ_SLOT(hostFoundSlot())); if (timeout() > 0) d->timer.start(timeout(), true); - TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent())); + TQTimer::singleShot(0, this, TQ_SLOT(connectionEvent())); } void KStreamSocket::connectionEvent() @@ -267,13 +267,13 @@ void KStreamSocket::connectionEvent() if (socketDevice()->error() == InProgress) { TQSocketNotifier *n = socketDevice()->readNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); n = socketDevice()->writeNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); return; // wait for activity @@ -350,8 +350,8 @@ bool KStreamSocket::bindLocallyFor(const KResolverEntry& peer) void KStreamSocket::connectionSucceeded(const KResolverEntry& peer) { - TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQT_SLOT(connectionEvent())); - TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQT_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQ_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQ_SLOT(connectionEvent())); resetError(); setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index c1f9e5848..a7557d585 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago@kde.org> * * @@ -70,14 +70,14 @@ class KStreamSocketPrivate; * : socket(hostname, port) * { * // connect signals to our slots - * TQObject::connect(&socket, TQT_SIGNAL(connected(const KResolverEntry&)), - * this, TQT_SLOT(slotSocketConnected())); - * TQObject::connect(&socket, TQT_SIGNAL(gotError(int)), - * this, TQT_SLOT(slotSocketError(int))); - * TQObject::connect(&socket, TQT_SIGNAL(readyRead()), - * this, TQT_SLOT(slotSocketReadyToRead())); - * TQObject::connect(&socket, TQT_SIGNAL(readyWrite()), - * this, TQT_SLOT(slotSocketReadyToWrite())); + * TQObject::connect(&socket, TQ_SIGNAL(connected(const KResolverEntry&)), + * this, TQ_SLOT(slotSocketConnected())); + * TQObject::connect(&socket, TQ_SIGNAL(gotError(int)), + * this, TQ_SLOT(slotSocketError(int))); + * TQObject::connect(&socket, TQ_SIGNAL(readyRead()), + * this, TQ_SLOT(slotSocketReadyToRead())); + * TQObject::connect(&socket, TQ_SIGNAL(readyWrite()), + * this, TQ_SLOT(slotSocketReadyToWrite())); * * // set non-blocking mode in order to work asynchronously * socket.setBlocking(false); @@ -96,7 +96,7 @@ class KStreamSocketPrivate; */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/network/syssocket.h b/tdecore/network/syssocket.h index 03e069940..d26cb085b 100644 --- a/tdecore/network/syssocket.h +++ b/tdecore/network/syssocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdeiobuffer.h b/tdecore/network/tdeiobuffer.h index 394af5b7b..cd8c75b86 100644 --- a/tdecore/network/tdeiobuffer.h +++ b/tdecore/network/tdeiobuffer.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdemulticastsocket.h b/tdecore/network/tdemulticastsocket.h index 09eeb01cd..a5345315a 100644 --- a/tdecore/network/tdemulticastsocket.h +++ b/tdecore/network/tdemulticastsocket.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdemulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h index 99511b356..a87c7fc98 100644 --- a/tdecore/network/tdemulticastsocketdevice.h +++ b/tdecore/network/tdemulticastsocketdevice.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp index a6da5f7c0..36adaa631 100644 --- a/tdecore/network/tdesocketaddress.cpp +++ b/tdecore/network/tdesocketaddress.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -191,17 +191,19 @@ TQString KIpAddress::toString() const char buf[sizeof "1111:2222:3333:4444:5555:6666:255.255.255.255" + 2]; buf[0] = '\0'; switch (m_version) - { + { case 4: inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1); return TQString::fromLatin1(buf); case 6: + { #ifdef AF_INET6 inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1); #endif return TQString::fromLatin1(buf); } + } return TQString::null; } @@ -294,11 +296,15 @@ public: switch (addr.generic->sa_family) { case AF_INET: + { return; // nothing to do here + } #ifdef AF_INET6 case AF_INET6: + { oldport = addr.in6->sin6_port; break; + } #endif } @@ -319,12 +325,16 @@ public: switch (addr.generic->sa_family) { case AF_INET: + { oldport = addr.in->sin_port; break; + } #ifdef AF_INET6 case AF_INET6: + { return; // nothing to do here + } #endif } @@ -517,12 +527,15 @@ bool TDESocketAddress::operator ==(const TDESocketAddress& other) const switch (d->addr.generic->sa_family) { case AF_INET: + { Q_ASSERT(d->reallen == SOCKADDR_IN_LEN); Q_ASSERT(other.d->reallen == SOCKADDR_IN_LEN); return memcmp(d->addr.in, other.d->addr.in, SOCKADDR_IN_LEN) == 0; + } #ifdef AF_INET6 case AF_INET6: + { Q_ASSERT(d->reallen >= MIN_SOCKADDR_IN6_LEN); Q_ASSERT(other.d->reallen >= MIN_SOCKADDR_IN6_LEN); @@ -540,6 +553,7 @@ bool TDESocketAddress::operator ==(const TDESocketAddress& other) const # endif return memcmp(d->addr.in6, other.d->addr.in6, d->reallen) == 0; + } #endif case AF_UNIX: @@ -566,10 +580,11 @@ TQString TDESocketAddress::nodeName() const switch (d->addr.generic->sa_family) { - case AF_INET: #ifdef AF_INET6 case AF_INET6: - +#endif + case AF_INET: +#ifdef AF_INET6 TQString scopeid("%"); if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id) scopeid += TQString::number(d->addr.in6->sin6_scope_id); @@ -592,10 +607,10 @@ TQString TDESocketAddress::serviceName() const switch (d->addr.generic->sa_family) { - case AF_INET: #ifdef AF_INET6 case AF_INET6: #endif + case AF_INET: return TQString::number(d->ref.port()); case AF_UNIX: @@ -652,11 +667,15 @@ int TDESocketAddress::ianaFamily(int af) switch (af) { case AF_INET: + { return 1; + } #ifdef AF_INET6 case AF_INET6: + { return 2; + } #endif default: @@ -669,11 +688,15 @@ int TDESocketAddress::fromIanaFamily(int iana) switch (iana) { case 1: + { return AF_INET; + } #ifdef AF_INET6 case 2: + { return AF_INET6; + } #endif default: @@ -743,11 +766,15 @@ int KInetSocketAddress::ipVersion() const switch (d->addr.generic->sa_family) { case AF_INET: + { return 4; + } #ifdef AF_INET6 case AF_INET6: + { return 6; + } #endif } @@ -762,10 +789,14 @@ KIpAddress KInetSocketAddress::ipAddress() const switch (d->addr.generic->sa_family) { case AF_INET: + { return KIpAddress(&d->addr.in->sin_addr, 4); + } #ifdef AF_INET6 case AF_INET6: + { return KIpAddress(&d->addr.in6->sin6_addr, 6); + } #endif } @@ -803,11 +834,15 @@ TQ_UINT16 KInetSocketAddress::port() const switch (d->addr.generic->sa_family) { case AF_INET: + { return ntohs(d->addr.in->sin_port); + } #ifdef AF_INET6 case AF_INET6: + { return ntohs(d->addr.in6->sin6_port); + } #endif } @@ -822,13 +857,17 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port) switch (d->addr.generic->sa_family) { case AF_INET: + { d->addr.in->sin_port = htons(port); break; + } #ifdef AF_INET6 case AF_INET6: + { d->addr.in6->sin6_port = htons(port); break; + } #endif default: diff --git a/tdecore/network/tdesocketaddress.h b/tdecore/network/tdesocketaddress.h index 100e05fb2..7aa9a6d20 100644 --- a/tdecore/network/tdesocketaddress.h +++ b/tdecore/network/tdesocketaddress.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp index 66decb15d..0b2ef90d7 100644 --- a/tdecore/network/tdesocketbase.cpp +++ b/tdecore/network/tdesocketbase.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003-2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -291,7 +291,7 @@ KActiveSocketBase::~KActiveSocketBase() int KActiveSocketBase::getch() { unsigned char c; - if (tqreadBlock((char*)&c, 1) != 1) + if (readBlock((char*)&c, 1) != 1) return -1; return c; @@ -300,7 +300,7 @@ int KActiveSocketBase::getch() int KActiveSocketBase::putch(int ch) { unsigned char c = (unsigned char)ch; - if (tqwriteBlock((char*)&c, 1) != 1) + if (writeBlock((char*)&c, 1) != 1) return -1; return c; diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h index bd0828408..d2a213300 100644 --- a/tdecore/network/tdesocketbase.h +++ b/tdecore/network/tdesocketbase.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -63,10 +63,10 @@ #include <tdelibs_export.h> /* - * This is extending QIODevice's error codes + * This is extending TQIODevice's error codes * * According to tqiodevice.h, the last error is IO_UnspecifiedError - * These errors will never occur in functions declared in QIODevice + * These errors will never occur in functions declared in TQIODevice * (except open, but you shouldn't call open) */ #define IO_ListenError (IO_UnspecifiedError+1) @@ -504,11 +504,7 @@ public: * This call is not supported on sockets. Reimplemented from TQIODevice. * This will always return 0. */ -#ifdef USE_QT4 - virtual qint64 size() const -#else // USE_QT4 virtual Offset size() const -#endif // USE_QT4 { return 0; } /** @@ -536,12 +532,7 @@ public: * Returns the number of bytes available for reading without * blocking. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const = 0; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const = 0; -#endif /** * Waits up to @p msecs for more data to be available on this socket. @@ -562,7 +553,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::readBlock for * more information. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG len) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0; /** @overload * Receives data and the source address. @@ -575,7 +566,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes read */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0; /** * Peeks the data in the socket. @@ -610,7 +601,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::writeBlock for * more information. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0; /** @overload * Writes the given data to the destination address. @@ -623,7 +614,7 @@ public: * @param to the address to send to * @returns the number of bytes actually sent */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) = 0; /** * Reads one character from the socket. diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 13c7c0447..36e64e0f0 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -274,7 +274,7 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) } // now try to write those bytes - TQ_LONG wrote = dev->tqwriteBlock(buf, count); + TQ_LONG wrote = dev->writeBlock(buf, count); if (wrote == -1) // error? @@ -315,7 +315,7 @@ TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len) // now do the reading TQByteArray a(len); - len = dev->tqreadBlock(a.data(), len); + len = dev->readBlock(a.data(), len); if (len == -1) // error? diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h index 2f8e4fa75..561629935 100644 --- a/tdecore/network/tdesocketbuffer_p.h +++ b/tdecore/network/tdesocketbuffer_p.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp index b97ad0ba0..b5aef0943 100644 --- a/tdecore/network/tdesocketdevice.cpp +++ b/tdecore/network/tdesocketdevice.cpp @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003,2005 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -171,7 +171,7 @@ bool TDESocketDevice::setSocketOptions(int opts) return true; // all went well } -bool TDESocketDevice::open(TQ_OpenMode) +bool TDESocketDevice::open(int) { resetError(); return false; @@ -364,12 +364,7 @@ bool TDESocketDevice::disconnect() return true; // all is well } -#ifdef USE_QT3 TQ_LONG TDESocketDevice::bytesAvailable() const -#endif -#ifdef USE_QT4 -qint64 TDESocketDevice::bytesAvailable() const -#endif { if (m_sockfd == -1) return -1; // there's nothing to read in a closed socket @@ -419,7 +414,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddr return 0; } -TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +435,7 @@ TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return retval; } -TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from) +TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -503,12 +498,12 @@ TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress return retval; } -TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len) { - return tqwriteBlock(data, len, TDESocketAddress()); + return writeBlock(data, len, TDESocketAddress()); } -TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) +TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) { resetError(); if (m_sockfd == -1) diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h index 52fe18709..2196e9d3f 100644 --- a/tdecore/network/tdesocketdevice.h +++ b/tdecore/network/tdesocketdevice.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- +/* * Copyright (C) 2003 Thiago Macieira <thiago.macieira@kdemail.net> * * @@ -142,7 +142,7 @@ public: /** * Reimplementation from TQIODevice. You should not call this function in sockets. */ - virtual bool open(TQ_OpenMode mode); + virtual bool open(int mode); /** * Closes the socket. Reimplemented from TQIODevice. @@ -198,12 +198,7 @@ public: /** * Returns the number of bytes available for reading without blocking. */ -#ifdef USE_QT3 virtual TQ_LONG bytesAvailable() const; -#endif -#ifdef USE_QT4 - virtual qint64 bytesAvailable() const; -#endif /** * Waits up to @p msecs for more data to be available on this socket. @@ -216,12 +211,12 @@ public: /** * Reads data from this socket. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Reads data and the source address from this socket. */ - virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from); /** * Peeks data in the socket. @@ -236,12 +231,12 @@ public: /** * Writes data to the socket. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Writes the given data to the given destination address. */ - virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to); /** * Returns this socket's local address. diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index 89499b902..79f34d806 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -202,11 +202,7 @@ public: TQWMatrix matrix = m_engine->painter()->parseTransform(transform); TQWMatrix *current = m_engine->painter()->worldMatrix(); -#ifdef USE_QT4 -printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n"); -#else // USE_QT4 *current = matrix * *current; -#endif // USE_QT4 } void parseCommonAttributes(TQDomNode &node) @@ -445,7 +441,7 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n { // Scale, if needed if(image.width() != (int) w || image.height() != (int) h) - image = image.smoothScale((int) w, (int) h, TQ_ScaleFree); + image = image.smoothScale((int) w, (int) h, TQImage::ScaleFree); m_engine->painter()->drawImage(x, y, image); } @@ -688,5 +684,3 @@ double KSVGIconEngine::height() { return d->height; } - -// vim:ts=4:noet diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp index ca781db15..7c2859656 100644 --- a/tdecore/svgicons/ksvgiconpainter.cpp +++ b/tdecore/svgicons/ksvgiconpainter.cpp @@ -57,7 +57,7 @@ public: m_clipSVP = 0; - m_fillColor = Qt::black; + m_fillColor = TQt::black; m_useFill = true; m_useStroke = false; @@ -747,7 +747,14 @@ public: d = (x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0); - sfactor_sq = 1.0 / d - 0.25; + if (d) + { + sfactor_sq = 1.0 / d - 0.25; + } + else + { + sfactor_sq = 0; + } if(sfactor_sq < 0) sfactor_sq = 0; @@ -770,7 +777,7 @@ public: else if(th_arc > 0 && !sweepFlag) th_arc -= 2 * M_PI; - n_segs = (int) (int) ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))); + n_segs = (int) ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))); for(i = 0; i < n_segs; i++) { @@ -1736,17 +1743,34 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled) double curx = 0.0, cury = 0.0, contrlx = 0.0, contrly = 0.0, xc, yc; unsigned int lastCommand = 0; - TQString _d = value.replace(",", " "); - _d = _d.simplifyWhiteSpace(); - const char *ptr = _d.latin1(); - const char *end = _d.latin1() + _d.length() + 1; + TQCString _d = value.replace(",", " ").simplifyWhiteSpace().latin1(); + const char *ptr = _d.data(); + const char *end = _d.data() + _d.length(); double tox, toy, x1, y1, x2, y2, rx, ry, angle; bool largeArc, sweep; - char command = *(ptr++); + char command = *ptr; while(ptr < end) { + + if(*ptr == '+' || *ptr == '-' || *ptr == '.' || (*ptr >= '0' && *ptr <= '9')) + { + // there are still coords in this command + if(command == 'M') + { + command = 'L'; + } + else if(command == 'm') + { + command = 'l'; + } + } + else + { + command = *(ptr++); + } + if(*ptr == ' ') ptr++; @@ -2172,10 +2196,19 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled) ptr = getCoord(ptr, rx); ptr = getCoord(ptr, ry); ptr = getCoord(ptr, angle); - ptr = getCoord(ptr, tox); - largeArc = tox == 1; - ptr = getCoord(ptr, tox); - sweep = tox == 1; + // 'largeArc' and 'sweep' are single digit flags. Some non conforming svg files do not + // separate those fields with separators, so we can't use getCoord() here. + // See TDE/tde issue #46 on TGW + largeArc = ((*ptr++) != '0'); + while (*ptr == ' ') + { + ptr++; + } + sweep = ((*ptr++) != '0'); + while (*ptr == ' ') + { + ptr++; + } ptr = getCoord(ptr, tox); ptr = getCoord(ptr, toy); @@ -2191,10 +2224,19 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled) ptr = getCoord(ptr, rx); ptr = getCoord(ptr, ry); ptr = getCoord(ptr, angle); - ptr = getCoord(ptr, tox); - largeArc = tox == 1; - ptr = getCoord(ptr, tox); - sweep = tox == 1; + // 'largeArc' and 'sweep' are single digit flags. Some non conforming svg files do not + // separate those fields with separators, so we can't use getCoord() here. + // See TDE/tde issue #46 on TGW + largeArc = ((*ptr++) != '0'); + while (*ptr == ' ') + { + ptr++; + } + sweep = ((*ptr++) != '0'); + while (*ptr == ' ') + { + ptr++; + } ptr = getCoord(ptr, tox); ptr = getCoord(ptr, toy); @@ -2208,23 +2250,6 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled) break; } - if(*ptr == '+' || *ptr == '-' || *ptr == '.' || (*ptr >= '0' && *ptr <= '9')) - { - // there are still coords in this command - if(command == 'M') - { - command = 'L'; - } - else if(command == 'm') - { - command = 'l'; - } - } - else - { - command = *(ptr++); - } - // Detect reflection points if(lastCommand != 'C' && lastCommand != 'c' && lastCommand != 'S' && lastCommand != 's' && diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index e200f80f4..accc5c80f 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -1,9 +1,7 @@ -// -*- c++ -*- - #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <stdio.h> @@ -179,7 +177,7 @@ int main(int argc, char **argv) "locale", I18N_NOOP("Translation files for TDELocale"), "mime", I18N_NOOP("Mime types"), "module", I18N_NOOP("Loadable modules"), - "qtplugins", I18N_NOOP("TQt plugins"), + "tqtplugins", I18N_NOOP("TQt plugins"), "services", I18N_NOOP("Services"), "servicetypes", I18N_NOOP("Service types"), "sound", I18N_NOOP("Application sounds"), @@ -244,7 +242,7 @@ int main(int argc, char **argv) "icon", "@ICON_INSTALL_DIR@", "lib", "@LIB_INSTALL_DIR@", "module", "@PLUGIN_INSTALL_DIR@", - "qtplugins", "@PLUGIN_INSTALL_DIR@/plugins", + "tqtplugins", "@PLUGIN_INSTALL_DIR@/plugins", "locale", "@LOCALE_INSTALL_DIR@", "mime", "@MIME_INSTALL_DIR@", "services", "@SERVICES_INSTALL_DIR@", diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index f86e5f5db..4968d9d4a 100644 --- a/tdecore/tde-config.cpp.in +++ b/tdecore/tde-config.cpp.in @@ -1,9 +1,7 @@ -// -*- c++ -*- - #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <stdio.h> @@ -120,7 +118,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. TDEInstance a("tde-config"); - a.setConfigReadOnly(TRUE); + a.setConfigReadOnly(true); (void)TDEGlobal::dirs(); // trigger the creation (void)TDEGlobal::config(); @@ -179,7 +177,7 @@ int main(int argc, char **argv) "locale", I18N_NOOP("Translation files for TDELocale"), "mime", I18N_NOOP("Mime types"), "module", I18N_NOOP("Loadable modules"), - "qtplugins", I18N_NOOP("Qt plugins"), + "tqtplugins", I18N_NOOP("TQt plugins"), "services", I18N_NOOP("Services"), "servicetypes", I18N_NOOP("Service types"), "sound", I18N_NOOP("Application sounds"), @@ -243,7 +241,7 @@ int main(int argc, char **argv) "icon", "@kde_icondir@", "lib", "@libdir@", "module", "@kde_moduledir@", - "qtplugins", "@kde_moduledir@/plugins", + "tqtplugins", "@kde_moduledir@/plugins", "locale", "@kde_locale@", "mime", "@kde_mimedir@", "services", "@kde_servicesdir@", diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp index 3a147842a..318a38d50 100644 --- a/tdecore/tdeaboutdata.cpp +++ b/tdecore/tdeaboutdata.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> @@ -446,6 +446,10 @@ TDEAboutData::license() const l = "QPL v1.0"; f = locate("data", "LICENSES/QPL_V1.0"); break; + case License_MIT: + l = "MIT"; + f = locate("data", "LICENSES/MIT"); + break; case License_Custom: if (mLicenseText && *mLicenseText) return( i18n(mLicenseText) ); diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h index 06f193f75..071da368b 100644 --- a/tdecore/tdeaboutdata.h +++ b/tdecore/tdeaboutdata.h @@ -199,7 +199,8 @@ class TDECORE_EXPORT TDEAboutData License_QPL = 5, License_QPL_V1_0 = 5, License_GPL_V3 = 6, - License_LGPL_V3 = 7 + License_LGPL_V3 = 7, + License_MIT = 8 }; public: diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp index 5430c2529..5796bf060 100644 --- a/tdecore/tdeaccel.cpp +++ b/tdecore/tdeaccel.cpp @@ -34,7 +34,7 @@ #include "tdeaccelprivate.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 # include <X11/Xlib.h> # ifdef KeyPress // needed for --enable-final // defined by X11 headers @@ -49,7 +49,7 @@ //--------------------------------------------------------------------- // // In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling -// This allows us to map the Win key to Qt::MetaButton, Qt does not know about +// This allows us to map the Win key to TQt::MetaButton, Qt does not know about // the Win key. // // TDEAccelEventHandler::x11Event will generate an AccelOverride event. The @@ -95,7 +95,7 @@ class TDEAccelEventHandler : public TQWidget private: TDEAccelEventHandler(); -# ifdef Q_WS_X11 +# ifdef TQ_WS_X11 bool x11Event( XEvent* pEvent ); # endif @@ -109,21 +109,21 @@ bool TDEAccelEventHandler::g_bAccelActivated = false; TDEAccelEventHandler::TDEAccelEventHandler() : TQWidget( 0, "TDEAccelEventHandler" ) { -# ifdef Q_WS_X11 - if ( kapp ) - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); +# ifdef TQ_WS_X11 + if ( tdeApp ) + tdeApp->installX11EventFilter( this ); # endif } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool tqt_try_modal( TQWidget *, XEvent * ); bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) { - if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) + if( TQWidget::keyboardGrabber() || !tdeApp->focusWidget() ) return false; - if ( !tqt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !tqt_try_modal(tdeApp->focusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -144,7 +144,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->focusWidget(), &ke ); + tdeApp->sendEvent( tdeApp->focusWidget(), &ke ); // If the Override event was accepted from a non-TDEAccel widget, // then kill the next AccelOverride in TDEApplication::notify. @@ -157,7 +157,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent ) return false; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 //--------------------------------------------------------------------- // TDEAccelPrivate @@ -170,9 +170,9 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch ) m_pAccel = pParent; m_pWatch = pWatch; m_bAutoUpdate = true; - connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) ); + connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) ); -#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working +#ifdef TQ_WS_X11 //only makes sense if TDEAccelEventHandler is working if( m_pWatch ) m_pWatch->installEventFilter( this ); #endif @@ -237,10 +237,10 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& m_mapIDToKey[nID] = keyQt; if( action.objSlotPtr() && action.methodSlotPtr() ) { -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ ((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() ); #else - ((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int))); + ((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int))); #endif if( !action.isEnabled() ) ((TQAccel*)m_pAccel)->setItemEnabled( nID, false ); @@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id ) int iAction = pMenu->idAt(1); slotMenuActivated( iAction ); } else { - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); } delete pMenu; } @@ -334,11 +334,11 @@ void TDEAccelPrivate::slotMenuActivated( int iAction ) { kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl; TDEAccelAction* pAction = actions().actionPtr( iAction ); -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ if( pAction ) { - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); - disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -362,12 +362,12 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) TDEAccelAction* pAction = m_mapIDToAction[nID]; if( !pAction->isEnabled() ) continue; -#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ TQGuardedPtr<TDEAccelPrivate> me = this; - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) { - disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -384,25 +384,25 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) return false; } -#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction ) { if( pAction ) { TQGuardedPtr<TDEAccelPrivate> me = this; TQRegExp reg( "([ ]*TDEAccelAction.*)" ); if( reg.search( pAction->methodSlotPtr()) >= 0 ) { - connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated( pAction ); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } else { - connect( this, TQT_SIGNAL(menuItemActivated()), + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated()), + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h index 2d205885c..c8114059d 100644 --- a/tdecore/tdeaccel.h +++ b/tdecore/tdeaccel.h @@ -74,9 +74,9 @@ class TDEAccelPrivate; * // Insert an action "Scroll Up" which is associated with the "Up" key: * pAccel->insert( "Scroll Up", i18n("Scroll up"), * i18n("Scroll up the current document by one line."), - * Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) ); + * TQt::Key_Up, this, TQ_SLOT(slotScrollUp()) ); * // Insert an standard acclerator action. - * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) ); + * pAccel->insert( TDEStdAccel::Print, this, TQ_SLOT(slotPrint()) ); * * // Update the shortcuts by read any user-defined settings from the * // application's config file. @@ -92,14 +92,14 @@ class TDEAccelPrivate; class TDECORE_EXPORT TDEAccel : public TQAccel { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new TDEAccel that watches @p pParent, which is also - * the QObject's parent. + * the TQObject's parent. * * @param pParent the parent and widget to watch for key strokes - * @param psName the name of the QObject + * @param psName the name of the TQObject */ TDEAccel( TQWidget* pParent, const char* psName = 0 ); @@ -107,8 +107,8 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * Creates a new TDEAccel that watches @p watch. * * @param watch the widget to watch for key strokes - * @param parent the parent of the QObject - * @param psName the name of the QObject + * @param parent the parent of the TQObject + * @param psName the name of the TQObject */ TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 ); virtual ~TDEAccel(); @@ -159,7 +159,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. @@ -191,7 +191,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * * Usage: * \code - * insert( i18n("Do Something"), ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); * \endcode * * @param psAction The name AND label of the action. @@ -319,47 +319,47 @@ class TDECORE_EXPORT TDEAccel : public TQAccel */ bool insertItem( const TQString& sLabel, const TQString& sAction, const char* psKey, - int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED; + int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED; /** * @deprecated use insert */ bool insertItem( const TQString& sLabel, const TQString& sAction, int key, - int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) KDE_DEPRECATED; + int nIDMenu = 0, TQPopupMenu* pMenu = 0, bool bConfigurable = true ) TDE_DEPRECATED; /** * @deprecated use insert */ - bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED; + bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) TDE_DEPRECATED; /** * @deprecated use insert */ - bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) KDE_DEPRECATED; + bool connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate = true ) TDE_DEPRECATED; /** * @deprecated use insert( accel, pObjSlot, psMethodSlot ); * */ - KDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot ) + TDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot ) { return insert( accel, pObjSlot, psMethodSlot ); } /** * @deprecated use remove */ - bool removeItem( const TQString& sAction ) KDE_DEPRECATED; + bool removeItem( const TQString& sAction ) TDE_DEPRECATED; /** * @deprecated */ - bool setItemEnabled( const TQString& sAction, bool bEnable ) KDE_DEPRECATED; + bool setItemEnabled( const TQString& sAction, bool bEnable ) TDE_DEPRECATED; /** * @deprecated see KDE3PORTING.html */ - void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) KDE_DEPRECATED; + void changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action ) TDE_DEPRECATED; /** * @deprecated see KDE3PORTING.html */ - void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) KDE_DEPRECATED; + void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) TDE_DEPRECATED; /** * @deprecated */ - static int stringToKey( const TQString& ) KDE_DEPRECATED; + static int stringToKey( const TQString& ) TDE_DEPRECATED; /** * @deprecated Use shortcut(). @@ -368,7 +368,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * @p action, or zero if either the action name cannot be * found or the current key is set to no key. */ - int currentKey( const TQString& action ) const KDE_DEPRECATED; + int currentKey( const TQString& action ) const TDE_DEPRECATED; /** * @deprecated Use actions().actionPtr(). @@ -376,7 +376,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * Return the name of the accelerator item with the keycode @p key, * or TQString::null if the item cannot be found. */ - TQString findKey( int key ) const KDE_DEPRECATED; + TQString findKey( int key ) const TDE_DEPRECATED; #endif // !KDE_NO_COMPAT protected: diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp index 41864d47c..a3fc23e3e 100644 --- a/tdecore/tdeaccelbase.cpp +++ b/tdecore/tdeaccelbase.cpp @@ -246,7 +246,7 @@ connect new key sequences } */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 struct TDEAccelBase::X { uint iAction, iSeq, iVari; @@ -269,7 +269,7 @@ struct TDEAccelBase::X bool operator >( const X& x ) { return compare( x ) > 0; } bool operator <=( const X& x ) { return compare( x ) <= 0; } }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 /* #1 Ctrl+A @@ -315,7 +315,7 @@ struct TDEAccelBase::X bool TDEAccelBase::updateConnections() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(125) << "TDEAccelBase::updateConnections() this = " << this << endl; // Retrieve the list of keys to be connected, sorted by priority. // (key, variation, seq) @@ -414,11 +414,11 @@ bool TDEAccelBase::updateConnections() << (((*it).pAction) ? (*it).pAction->name() : TQString::null) << "'" << endl; } #endif -#endif //Q_WS_X11 +#endif //TQ_WS_X11 return true; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Construct a list of keys to be connected, sorted highest priority first. void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) { @@ -455,7 +455,7 @@ void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys ) // sort by priority: iVariation[of first key], iSequence, iAction qHeapSort( rgKeys.begin(), rgKeys.end() ); } -#endif //Q_WS_X11 +#endif //TQ_WS_X11 bool TDEAccelBase::insertConnection( TDEAccelAction* pAction ) { diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h index ecd0ce358..7a2955b66 100644 --- a/tdecore/tdeaccelbase.h +++ b/tdecore/tdeaccelbase.h @@ -79,11 +79,11 @@ class TQWidget; * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" ); * // Insert an action "Scroll Down" which is not associated with any key: * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0); - * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) ); + * a->connectItem( "Scroll up", myWindow, TQ_SLOT( scrollUp() ) ); * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it * // is done automatially with the * // connect below! - * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) ); + * a->connectItem(TDEStdAccel::Print, myWindow, TQ_SLOT( printDoc() ) ); * * a->readSettings(); *\endcode @@ -93,12 +93,12 @@ class TQWidget; * * \code * int id; - * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc())); + * id = popup->insertItem("&Print",this, TQ_SLOT(printDoc())); * a->changeMenuAccel(popup, id, TDEStdAccel::Print ); * \endcode * * If you want a somewhat "exotic" name for your standard print action, like - * id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc())); + * id = popup->insertItem(i18n("Print &Document"),this, TQ_SLOT(printDoc())); * it might be a good idea to insert the standard action before as * a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") ) * as well, so that the user can easily find the corresponding function. @@ -107,7 +107,7 @@ class TQWidget; * in a menu could be done with * * \code - * id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp())); + * id = popup->insertItem(i18n"Scroll &up",this, TQ_SLOT(scrollUp())); * a->changeMenuAccel(popup, id, "Scroll Up" ); * \endcode * diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp index 4618dab17..3cc7eb22e 100644 --- a/tdecore/tdeaccelmanager.cpp +++ b/tdecore/tdeaccelmanager.cpp @@ -262,10 +262,10 @@ void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &u void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item) { - TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { - TQWidget *w = TQT_TQWIDGET(it); + TQWidget *w = static_cast<TQWidget*>(it); if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) ) continue; @@ -329,8 +329,8 @@ void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if ( !label->buddy() ) label = 0; else { - if ( label->textFormat() == Qt::RichText || - ( label->textFormat() == Qt::AutoText && + if ( label->textFormat() == TQt::RichText || + ( label->textFormat() == TQt::AutoText && TQStyleSheet::mightBeRichText( label->text() ) ) ) label = 0; } @@ -626,7 +626,7 @@ int TDEAccelString::maxWeight(int &index, const TQString &used) index = -1; for (uint pos=0; pos<m_pureText.length(); ++pos) - if (used.find(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0) + if (used.find(m_pureText[pos], 0, false) == -1 && m_pureText[pos].latin1() != 0) if (m_weight[pos] > max) { max = m_weight[pos]; @@ -734,7 +734,7 @@ TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup) : TQObject(popup), m_popup(popup), m_count(-1) { aboutToShow(); // do one check and then connect to show - connect(popup, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow())); } @@ -840,13 +840,13 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) : TQObject(stack), m_stack(stack) { aboutToShow(stack->visibleWidget()); // do one check and then connect to show - connect(stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SLOT(aboutToShow(TQWidget *))); + connect(stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SLOT(aboutToShow(TQWidget *))); } bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) { if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { - TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) ); + TDEAcceleratorManager::manage( tqApp->activeWindow() ); watched->removeEventFilter( this ); } return false; diff --git a/tdecore/tdeaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h index d9227e8da..fe071c982 100644 --- a/tdecore/tdeaccelmanager_private.h +++ b/tdecore/tdeaccelmanager_private.h @@ -133,7 +133,7 @@ class TQPopupMenu; class TDEPopupAccelManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -166,7 +166,7 @@ private: class QWidgetStackAccelManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h index c91e01f42..8e6672615 100644 --- a/tdecore/tdeaccelprivate.h +++ b/tdecore/tdeaccelprivate.h @@ -11,7 +11,7 @@ class TDEAccelAction; */ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase { - Q_OBJECT + TQ_OBJECT public: TDEAccel* m_pAccel; TQWidget* m_pWatch; @@ -38,7 +38,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase void menuItemActivated(TDEAccelAction*); private: -#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ +#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ void emitActivatedSignal(TDEAccelAction*); #endif @@ -47,7 +47,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase void slotShowMenu(); void slotMenuActivated( int iAction ); - bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject + bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject }; #endif // !__TDEACCELPRIVATE_H diff --git a/tdecore/kappdcopiface.cpp b/tdecore/tdeappdcopinterface.cpp index ed6e26163..c67d1931d 100644 --- a/tdecore/kappdcopiface.cpp +++ b/tdecore/tdeappdcopinterface.cpp @@ -17,54 +17,54 @@ Boston, MA 02110-1301, USA. */ -#include "kappdcopiface.h" +#include "tdeappdcopinterface.h" #include <tdeapplication.h> #include <dcopclient.h> #include <tdeglobal.h> #include <tdeconfig.h> -KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp) +TDEAppDCOPInterface::TDEAppDCOPInterface(TDEApplication * theKApp) : DCOPObject( "MainApplication-Interface") { m_TDEApplication = theKApp; } -KAppDCOPInterface::~KAppDCOPInterface() +TDEAppDCOPInterface::~TDEAppDCOPInterface() { } -void KAppDCOPInterface::disableSessionManagement() +void TDEAppDCOPInterface::disableSessionManagement() { } -TQCString KAppDCOPInterface::startupId() +TQCString TDEAppDCOPInterface::startupId() { return ""; } -TQCString KAppDCOPInterface::caption() +TQCString TDEAppDCOPInterface::caption() { return ""; } -void KAppDCOPInterface::quit() +void TDEAppDCOPInterface::quit() { m_TDEApplication->quit(); } -void KAppDCOPInterface::updateUserTimestamp( ulong time ) +void TDEAppDCOPInterface::updateUserTimestamp( ulong time ) { m_TDEApplication->updateUserTimestamp( time ); } -void KAppDCOPInterface::reparseConfiguration() +void TDEAppDCOPInterface::reparseConfiguration() { TDEGlobal::config()->reparseConfiguration(); } -void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) { +void TDEAppDCOPInterface::sendFakeKey( unsigned int keyCode) { m_TDEApplication->broadcastKeyCode(keyCode); } diff --git a/tdecore/kappdcopiface.h b/tdecore/tdeappdcopinterface.h index 164c8b115..281f452c2 100644 --- a/tdecore/kappdcopiface.h +++ b/tdecore/tdeappdcopinterface.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KAPPDCOP_INTERFACE_H -#define KAPPDCOP_INTERFACE_H +#ifndef __TDEAPPDCOP_INTERFACE_H__ +#define __TDEAPPDCOP_INTERFACE_H__ #include <dcopobject.h> #include <tqstringlist.h> @@ -34,7 +34,7 @@ dcop interface to all KDE applications that use it. @short DCOP interface to TDEApplication. @author Ian Reinhart Geiser <geiseri@yahoo.com> */ -class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject +class TDECORE_EXPORT TDEAppDCOPInterface : virtual public DCOPObject { K_DCOP @@ -44,12 +44,12 @@ public: @param theKapp - The parent TDEApplication object that will provide us with the functional interface. */ - KAppDCOPInterface( TDEApplication * theKapp ); + TDEAppDCOPInterface( TDEApplication * theKapp ); /** Destructor Cleans up the dcop connection. **/ - ~KAppDCOPInterface(); + ~TDEAppDCOPInterface(); k_dcop: /** Disable current applications session management diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 5be36f54e..4b5b427f3 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (C) 1998, 1999, 2000 KDE Team @@ -69,18 +69,18 @@ #endif #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdestyle.h> #include <kiconloader.h> #include <kclipboard.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdeglobalsettings.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kdatastream.h> #include <klibloader.h> #include <kmimesourcefactory.h> @@ -93,9 +93,9 @@ #include <kprotocolinfo.h> #include <kkeynative.h> #include <kmdcodec.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <tdestartupinfo.h> #endif @@ -110,7 +110,7 @@ #include <grp.h> #include <sys/types.h> -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN #include "twin.h" #endif @@ -123,18 +123,18 @@ #include <errno.h> #include <string.h> #include <netdb.h> -#if defined Q_WS_X11 -//#ifndef Q_WS_QWS //FIXME(E): NetWM should talk to QWS... +#if defined TQ_WS_X11 +//#ifndef TQ_WS_QWS //FIXME(E): NetWM should talk to QWS... #include <netwm.h> #endif -#include "kprocctrl.h" +#include "tdeprocctrl.h" #ifdef HAVE_PATHS_H #include <paths.h> #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #ifdef COMPOSITE #include <X11/extensions/Xrender.h> @@ -149,7 +149,7 @@ #include <pwd.h> -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN #include <KDE-ICE/ICElib.h> #else typedef void* IceIOErrorHandler; @@ -160,22 +160,22 @@ typedef void* IceIOErrorHandler; #define Button3Mask (1<<10) #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) #define DISPLAY "QWS_DISPLAY" #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <kipc.h> #endif -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <Carbon/Carbon.h> #include <tqimage.h> #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <sys/ioctl.h> #ifdef __linux__ #include <linux/vt.h> @@ -185,24 +185,24 @@ extern int getfd(const char *fnam); } #endif -#include "kappdcopiface.h" +#include "tdeappdcopinterface.h" // exported for tdm kfrontend -KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm +TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm bool kde_kiosk_exception = false; // flag to disable kiosk restrictions bool kde_kiosk_admin = false; -TDEApplication* TDEApplication::KApp = 0L; +TDEApplication* TDEApplication::TDEApp = nullptr; bool TDEApplication::loadedByKdeinit = false; -DCOPClient *TDEApplication::s_DCOPClient = 0L; +DCOPClient *TDEApplication::s_DCOPClient = nullptr; bool TDEApplication::s_dcopClientNeedsPostInit = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static Atom atom_DesktopWindow; static Atom atom_NetSupported; #endif -#if defined(Q_WS_X11) && defined(COMPOSITE) +#if defined(TQ_WS_X11) && defined(COMPOSITE) static int composite_event, composite_error, composite_opcode; static bool x11_composite_error_generated; static int x11_error(Display *dpy, XErrorEvent *ev) { @@ -221,16 +221,16 @@ TDECORE_EXPORT bool tqt_qclipboard_bailout_hack = false; template class TQPtrList<KSessionManaged>; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 extern "C" { static int kde_xio_errhandler( Display * dpy ) { - return kapp->xioErrhandler( dpy ); + return tdeApp->xioErrhandler( dpy ); } static int kde_x_errhandler( Display *dpy, XErrorEvent *err ) { - return kapp->xErrhandler( dpy, err ); + return tdeApp->xErrhandler( dpy, err ); } } @@ -238,20 +238,20 @@ static int kde_x_errhandler( Display *dpy, XErrorEvent *err ) extern "C" { static void kde_ice_ioerrorhandler( IceConn conn ) { - if(kapp) - kapp->iceIOErrorHandler( conn ); + if(tdeApp) + tdeApp->iceIOErrorHandler( conn ); // else ignore the error for now } } #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN void TDEApplication_init_windows(bool GUIenabled); class QAssistantClient; #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // -------------------------------------------------------------------------------------- // Get the VT number X is running on // (code taken from GDM, daemon/getvt.c, GPLv2+) @@ -310,7 +310,7 @@ int get_x_vtnum(Display *dpy) return num; } // -------------------------------------------------------------------------------------- -#endif // Q_WS_X11 +#endif // TQ_WS_X11 /* Private data to make keeping binary compatibility easier @@ -326,12 +326,12 @@ public: overrideStyle( TQString::null ), startup_id( "0" ), app_started_timer( NULL ), - m_KAppDCOPInterface( 0L ), + m_TDEAppDCOPInterface( 0L ), session_save( false ) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ,oldXErrorHandler( NULL ) ,oldXIOErrorHandler( NULL ) -#elif defined Q_WS_WIN +#elif defined TQ_WS_WIN ,qassistantclient( 0 ) #endif { @@ -339,7 +339,7 @@ public: ~TDEApplicationPrivate() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN delete qassistantclient; #endif } @@ -360,12 +360,12 @@ public: TQString geometry_arg; TQCString startup_id; TQTimer* app_started_timer; - KAppDCOPInterface *m_KAppDCOPInterface; + TDEAppDCOPInterface *m_TDEAppDCOPInterface; bool session_save; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 int (*oldXErrorHandler)(Display*,XErrorEvent*); int (*oldXIOErrorHandler)(Display*); -#elif defined Q_WS_WIN +#elif defined TQ_WS_WIN QAssistantClient* qassistantclient; #endif @@ -522,7 +522,7 @@ void TDEApplication::installX11EventFilter( TQWidget* filter ) return; if (!x11Filter) x11Filter = new TQPtrList<TQWidget>; - connect ( filter, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( x11FilterDestroyed() ) ); + connect ( filter, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( x11FilterDestroyed() ) ); x11Filter->append( filter ); } @@ -557,7 +557,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) // Indicate that the accelerator has been overridden. if (t == TQEvent::AccelOverride) { - TQT_TQKEYEVENT(event)->accept(); + static_cast<TQKeyEvent*>(event)->accept(); return true; } else @@ -567,11 +567,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress)) { static const TDEShortcut& _selectAll = TDEStdAccel::selectAll(); - TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver); + TQLineEdit *edit = ::tqt_cast<TQLineEdit *>(receiver); if (edit) { // We have a keypress for a lineedit... - TQKeyEvent *kevent = TQT_TQKEYEVENT(event); + TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event); KKey key(kevent); if (_selectAll.contains(key)) { @@ -586,7 +586,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } } // Ctrl-U deletes from start of line. - if (key == KKey(Qt::CTRL + Qt::Key_U)) + if (key == KKey(TQt::CTRL + TQt::Key_U)) { if (t == TQEvent::KeyPress) { @@ -605,11 +605,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } } - TQTextEdit *medit = ::tqqt_cast<TQTextEdit *>(receiver); + TQTextEdit *medit = ::tqt_cast<TQTextEdit *>(receiver); if (medit) { // We have a keypress for a multilineedit... - TQKeyEvent *kevent = TQT_TQKEYEVENT(event); + TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event); if (_selectAll.contains(KKey(kevent))) { if (t == TQEvent::KeyPress) @@ -626,9 +626,9 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) } if( t == TQEvent::Show && receiver->isWidgetType()) { - TQWidget* w = TQT_TQWIDGET( receiver ); -#if defined Q_WS_X11 - if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader? + TQWidget* w = static_cast<TQWidget*>( receiver ); +#if defined TQ_WS_X11 + if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader? TDEStartupInfo::setWindowStartupId( w->winId(), startupId()); #endif if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous()) @@ -636,7 +636,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if( d->app_started_timer == NULL ) { d->app_started_timer = new TQTimer( this, "app_started_timer" ); - connect( d->app_started_timer, TQT_SIGNAL( timeout()), TQT_SLOT( checkAppStartedSlot())); + connect( d->app_started_timer, TQ_SIGNAL( timeout()), TQ_SLOT( checkAppStartedSlot())); } if( !d->app_started_timer->isActive()) d->app_started_timer->start( 0, true ); @@ -651,7 +651,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if( !ic->isNull()) { w->setIcon( *ic ); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 KWin::setIcons( w->winId(), *ic, miniIcon()); #endif } @@ -662,7 +662,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) void TDEApplication::checkAppStartedSlot() { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfo::handleAutoAppStartedSending(); #endif } @@ -689,7 +689,7 @@ TQString TDEApplication::sessionConfigName() const return TQString("session/%1_%2_%3").arg(name()).arg(sessionId()).arg(sessKey); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static SmcConn mySmcConnection = 0; static SmcConn tmpSmcConnection = 0; #else @@ -701,7 +701,7 @@ static TQTime* smModificationTime = 0; TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled, bool SMenabled ) : TQApplication( argc, argv, GUIenabled, SMenabled ), TDEInstance(rAppName), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -720,7 +720,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam TDECmdLineArgs::initIgnore(argc, argv, rAppName.data()); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } // FIXME @@ -729,7 +729,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -748,14 +748,13 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam TDECmdLineArgs::initIgnore(argc, argv, rAppName.data()); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) : -// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps TDEInstance( TDECmdLineArgs::about), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -772,17 +771,16 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable installSigpipeHandler(); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } // FIXME // FOR BINARY COMPATIBILITY ONLY // REMOVE WHEN PRACTICAL! TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : -// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps TDEInstance( TDECmdLineArgs::about), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), argb_visual(false), #endif @@ -799,10 +797,10 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : installSigpipeHandler(); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ), @@ -816,10 +814,10 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) : installSigpipeHandler(); parseCommandLine( ); init( true ); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) : +TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ), TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate) @@ -833,10 +831,10 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visu installSigpipeHandler(); parseCommandLine( ); init( true ); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), @@ -852,10 +850,10 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo installSigpipeHandler(); parseCommandLine( ); init( true ); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } -TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap, +TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles, TDEInstance * _instance ) : TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ), @@ -871,7 +869,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo installSigpipeHandler(); parseCommandLine( ); init( true ); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } #endif @@ -879,7 +877,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), TDEInstance( _instance ), -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 display(0L), #endif argb_visual(false), @@ -896,10 +894,10 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* installSigpipeHandler(); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( display ), TDEInstance(rAppName), @@ -921,16 +919,16 @@ TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const T TDECmdLineArgs::initIgnore(argc, argv, rAppName.data()); parseCommandLine( ); init(GUIenabled); - d->m_KAppDCOPInterface = new KAppDCOPInterface(this); + d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this); } #endif int TDEApplication::xioErrhandler( Display* dpy ) { - if(kapp) + if(tdeApp) { emit shutDown(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->oldXIOErrorHandler( dpy ); #else Q_UNUSED(dpy); @@ -942,9 +940,9 @@ int TDEApplication::xioErrhandler( Display* dpy ) int TDEApplication::xErrhandler( Display* dpy, void* err_ ) { // no idea how to make forward decl. for XErrorEvent -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XErrorEvent* err = static_cast< XErrorEvent* >( err_ ); - if(kapp) + if(tdeApp) { // add KDE specific stuff here d->oldXErrorHandler( dpy, err ); @@ -957,7 +955,7 @@ void TDEApplication::iceIOErrorHandler( _IceConn *conn ) { emit shutDown(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( d->oldIceIOErrorHandler != NULL ) (*d->oldIceIOErrorHandler)( conn ); #endif @@ -999,10 +997,10 @@ void TDEApplication::init(bool GUIenabled) TQApplication::setDesktopSettingsAware( false ); - KApp = this; + TDEApp = this; -#ifdef Q_WS_X11 //FIXME(E) +#ifdef TQ_WS_X11 //FIXME(E) // create all required atoms in _one_ roundtrip to the X server if ( GUIenabled ) { const int max = 20; @@ -1033,7 +1031,7 @@ void TDEApplication::init(bool GUIenabled) smw = 0; // Initial KIPC event mask. -#if defined Q_WS_X11 +#if defined TQ_WS_X11 kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) | (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) | (1 << KIPC::ToolbarStyleChanged) | (1 << KIPC::SettingsChanged) | @@ -1050,7 +1048,7 @@ void TDEApplication::init(bool GUIenabled) // kdialog itself. // * Don't warn if we run with a read-only $HOME TQCString readOnly = getenv("TDE_HOME_READONLY"); - if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0)) + if (readOnly.isEmpty() && (qstrcmp(name(), "kdialog") != 0)) { TDEConfigGroupSaver saver(config, "KDE Action Restrictions"); if (config->readBoolEntry("warn_unwritable_config",true)) @@ -1059,7 +1057,7 @@ void TDEApplication::init(bool GUIenabled) if (GUIenabled) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // this is important since we fork() to launch the help (Matthias) fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, FD_CLOEXEC); // set up the fancy (=robust and error ignoring ) KDE xio error handlers (Matthias) @@ -1067,14 +1065,14 @@ void TDEApplication::init(bool GUIenabled) d->oldXIOErrorHandler = XSetIOErrorHandler( kde_xio_errhandler ); #endif - connect( this, TQT_SIGNAL( aboutToQuit() ), this, TQT_SIGNAL( shutDown() ) ); + connect( this, TQ_SIGNAL( aboutToQuit() ), this, TQ_SIGNAL( shutDown() ) ); -#ifdef Q_WS_X11 //FIXME(E) +#ifdef TQ_WS_X11 //FIXME(E) display = desktop()->x11Display(); #endif { - TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "tqtplugins" ); TQStringList::Iterator it = plugins.begin(); while (it != plugins.end()) { addLibraryPath( *it ); @@ -1101,10 +1099,10 @@ void TDEApplication::init(bool GUIenabled) TQMimeSourceFactory::addFactory( oldDefaultFactory ); } - d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); + d->checkAccelerators = new KCheckAccelerators( this ); } -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX if (GUIenabled) { TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), TDEIcon::NoGroup, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, false ); @@ -1134,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled) // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // which makes it impossible to use the -reverse cmdline switch with KDE apps bool rtl = reverseLayout(); - installTranslator(new KDETranslator(TQT_TQOBJECT(this))); + installTranslator(new KDETranslator(this)); setReverseLayout( rtl ); if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " "left-to-right languages (as english) or to 'RTL' in right-to-left " @@ -1147,7 +1145,7 @@ void TDEApplication::init(bool GUIenabled) pSessionConfig = 0L; bSessionManagement = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // register a communication window for desktop changes (Matthias) if (GUIenabled && kde_have_kipc ) { @@ -1158,7 +1156,7 @@ void TDEApplication::init(bool GUIenabled) 32, PropModeReplace, (unsigned char *)&data, 1); } d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) TDEApplication_init_windows(GUIenabled); #else // FIXME(E): Implement for Qt Embedded @@ -1197,11 +1195,11 @@ DCOPClient *TDEApplication::dcopClient() { s_DCOPClient->setServerAddress( args->getOption("dcopserver")); } - if( kapp ) { - connect(s_DCOPClient, TQT_SIGNAL(attachFailed(const TQString &)), - kapp, TQT_SLOT(dcopFailure(const TQString &))); - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - kapp, TQT_SLOT(dcopBlockUserInput(bool)) ); + if( tdeApp ) { + connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)), + tdeApp, TQ_SLOT(dcopFailure(const TQString &))); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + tdeApp, TQ_SLOT(dcopBlockUserInput(bool)) ); } else s_dcopClientNeedsPostInit = true; @@ -1215,8 +1213,8 @@ void TDEApplication::dcopClientPostInit() if( s_dcopClientNeedsPostInit ) { s_dcopClientNeedsPostInit = false; - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - TQT_SLOT(dcopBlockUserInput(bool)) ); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + TQ_SLOT(dcopBlockUserInput(bool)) ); s_DCOPClient->bindToApp(); // Make sure we get events from the DCOPClient. } } @@ -1288,7 +1286,7 @@ void TDEApplication::disableSessionManagement() { void TDEApplication::enableSessionManagement() { bSessionManagement = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Session management support in Qt/TDE is awfully broken. // If konqueror disables session management right after its startup, // and enables it later (preloading stuff), it won't be properly @@ -1313,7 +1311,7 @@ void TDEApplication::enableSessionManagement() { bool TDEApplication::requestShutDown( ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQApplication::syncX(); /* use ksmserver's dcop interface if necessary */ if ( confirm == ShutdownConfirmYes || @@ -1375,7 +1373,7 @@ bool TDEApplication::requestShutDown( void TDEApplication::propagateSessionManager() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv(DISPLAY); // strip the screen number from the display @@ -1389,7 +1387,7 @@ void TDEApplication::propagateSessionManager() bool check = smEnv.isEmpty(); if ( !check && smModificationTime ) { TQFileInfo info( fName ); - TQTime current = TQT_TQTIME_OBJECT(info.lastModified().time()); + TQTime current = info.lastModified().time(); check = current > *smModificationTime; } if ( check ) { @@ -1398,7 +1396,7 @@ void TDEApplication::propagateSessionManager() if ( !f.open( IO_ReadOnly ) ) return; TQFileInfo info ( f ); - smModificationTime = new TQTime( TQT_TQTIME_OBJECT(info.lastModified().time()) ); + smModificationTime = new TQTime( info.lastModified().time() ); TQTextStream t(&f); t.setEncoding( TQTextStream::Latin1 ); TQString s = t.readLine(); @@ -1484,7 +1482,7 @@ static void checkRestartVersion( TQSessionManager& sm ) void TDEApplication::saveState( TQSessionManager& sm ) { d->session_save = true; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static bool firstTime = true; mySmcConnection = (SmcConn) sm.handle(); @@ -1570,7 +1568,7 @@ bool TDEApplication::sessionSaving() const void TDEApplication::startKdeinit() { -#ifndef Q_WS_WIN //TODO +#ifndef TQ_WS_WIN //TODO TDEInstance inst( "starttdeinitlock" ); TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) { @@ -1585,10 +1583,10 @@ void TDEApplication::startKdeinit() srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; - if (kapp && (Tty != kapp->type())) - setOverrideCursor( tqwaitCursor ); + if (tdeApp && (Tty != tdeApp->type())) + setOverrideCursor( TQt::waitCursor ); my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup"); - if (kapp && (Tty != kapp->type())) + if (tdeApp && (Tty != tdeApp->type())) restoreOverrideCursor(); #endif } @@ -1604,7 +1602,7 @@ void TDEApplication::dcopFailure(const TQString &msg) } if (failureCount == 2) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TDEGlobal::config()->setGroup("General"); if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) return; @@ -1615,12 +1613,12 @@ void TDEApplication::dcopFailure(const TQString &msg) msgStr += msg; msgStr += i18n("\n\nPlease check that the \"dcopserver\" program is running!"); - if (Tty != kapp->type()) + if (Tty != tdeApp->type()) { TQMessageBox::critical ( - kapp->mainWidget(), - i18n("DCOP communications error (%1)").arg(kapp->caption()), + tdeApp->mainWidget(), + i18n("DCOP communications error (%1)").arg(tdeApp->caption()), msgStr, i18n("&OK") ); @@ -1637,7 +1635,7 @@ void TDEApplication::dcopFailure(const TQString &msg) static const TDECmdLineOptions qt_options[] = { //FIXME: Check if other options are specific to Qt/X11 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 { "display <displayname>", I18N_NOOP("Use the X-server display 'displayname'"), 0}, #else { "display <displayname>", I18N_NOOP("Use the QWS display 'displayname'"), 0}, @@ -1658,13 +1656,13 @@ static const TDECmdLineOptions qt_options[] = { "button <color>", I18N_NOOP("sets the default button color"), 0}, { "name <name>", I18N_NOOP("sets the application name"), 0}, { "title <title>", I18N_NOOP("sets the application title (caption)"), 0}, -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 { "visual TrueColor", I18N_NOOP("forces the application to use a TrueColor visual on\nan 8-bit display"), 0}, { "inputstyle <inputstyle>", I18N_NOOP("sets XIM (X Input Method) input style. Possible\nvalues are onthespot, overthespot, offthespot and\nroot"), 0 }, { "im <XIM server>", I18N_NOOP("set XIM server"),0}, { "noxim", I18N_NOOP("disable XIM"), 0 }, #endif -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0}, #endif { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0}, @@ -1710,7 +1708,7 @@ void TDEApplication::parseCommandLine( ) if (args->isSet("style")) { - TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "tqtplugins" ); TQStringList::Iterator itp = plugins.begin(); while (itp != plugins.end()) { addLibraryPath( *itp ); @@ -1781,7 +1779,7 @@ void TDEApplication::parseCommandLine( ) TDECrash::setApplicationName(TQString(args->appName())); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( args->isSet( "waitforwm" ) ) { Atom type; (void) desktop(); // trigger desktop creation, we need PropertyNotify events for the root window @@ -1860,7 +1858,7 @@ TDEApplication::~TDEApplication() aIconPixmap.pm.miniIcon = 0L; delete aIconPixmap.pm.icon; aIconPixmap.pm.icon = 0L; - delete d->m_KAppDCOPInterface; + delete d->m_TDEAppDCOPInterface; // First call the static deleters and then call KLibLoader::cleanup() // The static deleters may delete libraries for which they need KLibLoader. @@ -1872,11 +1870,11 @@ TDEApplication::~TDEApplication() // close down IPC delete s_DCOPClient; - s_DCOPClient = 0L; + s_DCOPClient = nullptr; TDEProcessController::deref(); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( d->oldXErrorHandler != NULL ) XSetErrorHandler( d->oldXErrorHandler ); if ( d->oldXIOErrorHandler != NULL ) @@ -1886,9 +1884,9 @@ TDEApplication::~TDEApplication() #endif delete d; - KApp = 0; + TDEApp = nullptr; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 mySmcConnection = 0; delete smModificationTime; smModificationTime = 0; @@ -1904,7 +1902,7 @@ TDEApplication::~TDEApplication() } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 class KAppX11HackWidget: public TQWidget { public: @@ -1912,7 +1910,7 @@ public: }; #endif -#if defined(Q_WS_X11) && defined(COMPOSITE) +#if defined(TQ_WS_X11) && defined(COMPOSITE) bool TDEApplication::isCompositionManagerAvailable() { bool have_manager = false; @@ -2034,23 +2032,23 @@ Display* TDEApplication::openX11RGBADisplay() { return dpy; } -Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { getX11RGBAInformation(dpy); if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_visual; } else { - return (Qt::HANDLE)NULL; + return (TQt::HANDLE)NULL; } } -Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { getX11RGBAInformation(dpy); if (TDEApplication::isCompositionManagerAvailable() == true) { return argb_x11_colormap; } else { - return (Qt::HANDLE)NULL; + return (TQt::HANDLE)NULL; } } @@ -2091,8 +2089,8 @@ void TDEApplication::getX11RGBAInformation(Display *dpy) { } if( argb_visual ) { - argb_x11_visual = Qt::HANDLE( visual ); - argb_x11_colormap = Qt::HANDLE( colormap ); + argb_x11_visual = TQt::HANDLE( visual ); + argb_x11_colormap = TQt::HANDLE( colormap ); argb_visual = true; return; } @@ -2146,11 +2144,11 @@ Display* TDEApplication::openX11RGBADisplay() { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) { return 0; } -Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { +TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) { return 0; } @@ -2166,7 +2164,7 @@ void TDEApplication::dcopBlockUserInput( bool b ) kapp_block_user_input = b; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool TDEApplication::x11EventFilter( XEvent *_event ) { if ( kapp_block_user_input ) { @@ -2263,11 +2261,11 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) } return false; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 void TDEApplication::updateUserTimestamp( unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 Display *display = tqt_xdisplay(); if (!display) { return; @@ -2283,16 +2281,16 @@ void TDEApplication::updateUserTimestamp( unsigned long time ) time = ev.xproperty.time; XDestroyWindow( display, w ); } - if( GET_QT_X_USER_TIME() == 0 - || NET::timestampCompare( time, GET_QT_X_USER_TIME() ) > 0 ) // check time > tqt_x_user_time - SET_QT_X_USER_TIME(time); + if( get_tqt_x_user_time() == 0 + || NET::timestampCompare( time, get_tqt_x_user_time() ) > 0 ) // check time > tqt_x_user_time + set_tqt_x_user_time(time); #endif } unsigned long TDEApplication::userTimestamp() const { -#if defined Q_WS_X11 - return GET_QT_X_USER_TIME(); +#if defined TQ_WS_X11 + return get_tqt_x_user_time(); #else return 0; #endif @@ -2300,16 +2298,16 @@ unsigned long TDEApplication::userTimestamp() const void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( time == 0 ) - time = GET_QT_X_USER_TIME(); + time = get_tqt_x_user_time(); DCOPRef( dcopId, "MainApplication-Interface" ).call( "updateUserTimestamp", time ); #endif } void TDEApplication::invokeEditSlot( const char *slot ) { - TQObject *object = TQT_TQOBJECT(focusWidget()); + TQObject *object = focusWidget(); if( !object ) return; @@ -2443,13 +2441,13 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr TQColor trinity4VisitedLink( 82, 24, 139 ); TQColor background = config->readColorEntry( "background", &trinity4Background ); - TQColor foreground = config->readColorEntry( "foreground", tqblackptr ); + TQColor foreground = config->readColorEntry( "foreground", &TQt::black ); TQColor button = config->readColorEntry( "buttonBackground", &trinity4Button ); - TQColor buttonText = config->readColorEntry( "buttonForeground", tqblackptr ); + TQColor buttonText = config->readColorEntry( "buttonForeground", &TQt::black ); TQColor highlight = config->readColorEntry( "selectBackground", &trinity4Blue ); - TQColor highlightedText = config->readColorEntry( "selectForeground", tqwhiteptr ); - TQColor base = config->readColorEntry( "windowBackground", tqwhiteptr ); - TQColor baseText = config->readColorEntry( "windowForeground", tqblackptr ); + TQColor highlightedText = config->readColorEntry( "selectForeground", &TQt::white ); + TQColor base = config->readColorEntry( "windowBackground", &TQt::white ); + TQColor baseText = config->readColorEntry( "windowForeground", &TQt::black ); TQColor link = config->readColorEntry( "linkColor", &trinity4Link ); TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink ); @@ -2464,12 +2462,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr if (v > 128) // dark bg, light fg - need a darker disabled fg disfg = disfg.dark(lowlightVal); - else if (disfg != Qt::black) + else if (disfg != TQt::black) // light bg, dark fg - need a lighter disabled fg - but only if !black disfg = disfg.light(highlightVal); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; TQColorGroup disabledgrp(disfg, background, @@ -2502,12 +2500,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr if (v > 128) // dark button, light buttonText - need a darker disabled buttonText disbtntext = disbtntext.dark(lowlightVal); - else if (disbtntext != Qt::black) + else if (disbtntext != TQt::black) // light buttonText, dark button - need a lighter disabled buttonText - but only if !black disbtntext = disbtntext.light(highlightVal); else // black button - use darkgray disabled buttonText - disbtntext = Qt::darkGray; + disbtntext = TQt::darkGray; disabledgrp.setColor(TQColorGroup::ButtonText, disbtntext); disabledgrp.setColor(TQColorGroup::Midlight, background.light(110)); @@ -2521,12 +2519,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr void TDEApplication::tdedisplaySetPalette() { -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX //Can I have this on other platforms, please!? --Sam { TDEConfig *config = TDEGlobal::config(); TDEConfigGroupSaver saver( config, "General" ); - bool do_not_set_palette = FALSE; + bool do_not_set_palette = false; if(config->readBoolEntry("nopaletteChange", &do_not_set_palette)) return; } @@ -2540,8 +2538,8 @@ void TDEApplication::tdedisplaySetPalette() void TDEApplication::tdedisplaySetFont() { TQApplication::setFont(TDEGlobalSettings::generalFont(), true); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar"); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu"); TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts @@ -2593,15 +2591,15 @@ void TDEApplication::propagateSettings(SettingsCategory arg) TQApplication::setWheelScrollLines(num); bool b = config->readBoolEntry("EffectAnimateMenu", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, b); b = config->readBoolEntry("EffectFadeMenu", false); - TQApplication::setEffectEnabled( Qt::UI_FadeMenu, b); + TQApplication::setEffectEnabled( TQt::UI_FadeMenu, b); b = config->readBoolEntry("EffectAnimateCombo", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, b); b = config->readBoolEntry("EffectAnimateTooltip", false); - TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, b); + TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, b); b = config->readBoolEntry("EffectFadeTooltip", false); - TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, b); + TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, b); b = !config->readBoolEntry("EffectNoTooltip", false); TQToolTip::setGloballyEnabled( b ); @@ -2644,8 +2642,8 @@ void TDEApplication::installKDEPropertyMap() kdeMap->insert( "KIntSpinBox", "value" ); kdeMap->insert( "KDoubleNumInput", "value" ); // Temp til fixed in QT then enable ifdef with the correct version num - kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" ); - kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" ); + kdeMap->insert( "TQGroupBox", "checked" ); + kdeMap->insert( "TQTabWidget", "currentPage" ); TQSqlPropertyMap::installDefaultMap( kdeMap ); #endif } @@ -2656,7 +2654,7 @@ void TDEApplication::invokeHelp( const TQString& anchor, return invokeHelp( anchor, _appname, "" ); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // for win32 we're using simple help tools like Qt Assistant, // see kapplication_win.cpp void TDEApplication::invokeHelp( const TQString& anchor, @@ -2680,8 +2678,8 @@ void TDEApplication::invokeHelp( const TQString& anchor, { if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, startup_id, false)) { - if (Tty != kapp->type()) - TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"), + if (Tty != tdeApp->type()) + TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"), i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK")); else kdWarning() << "Could not launch help:\n" << error << endl; @@ -2715,8 +2713,8 @@ void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString& { if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, "", false)) { - if (Tty != kapp->type()) - TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"), + if (Tty != tdeApp->type()) + TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Help Center"), i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK")); else kdWarning() << "Could not launch help:\n" << error << endl; @@ -2789,7 +2787,7 @@ void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const return invokeMailer(to,cc,bcc,subject,body,messageFile,attachURLs,""); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp @@ -2986,8 +2984,8 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons // TODO this should check if cmd has a .desktop file, and use data from it, together // with sending more ASN data if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id )) { - if (Tty != kapp->type()) { - TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"), + if (Tty != tdeApp->type()) { + TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Mail Client"), i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK")); } else { @@ -3002,7 +3000,7 @@ void TDEApplication::invokeBrowser( const TQString &url ) return invokeBrowser( url, "" ); } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN // on win32, for invoking browser we're using win32 API // see kapplication_win.cpp void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id ) @@ -3011,8 +3009,8 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu if (startServiceByDesktopName("kfmclient", url, &error, 0, 0, startup_id, false)) { - if (Tty != kapp->type()) - TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Browser"), + if (Tty != tdeApp->type()) + TQMessageBox::critical(tdeApp->mainWidget(), i18n("Could not Launch Browser"), i18n("Could not launch the browser:\n\n%1").arg(error), i18n("&OK")); else kdWarning() << "Could not launch browser:\n" << error << endl; @@ -3023,27 +3021,27 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu void TDEApplication::cut() { - invokeEditSlot( TQT_SLOT( cut() ) ); + invokeEditSlot( TQ_SLOT( cut() ) ); } void TDEApplication::copy() { - invokeEditSlot( TQT_SLOT( copy() ) ); + invokeEditSlot( TQ_SLOT( copy() ) ); } void TDEApplication::paste() { - invokeEditSlot( TQT_SLOT( paste() ) ); + invokeEditSlot( TQ_SLOT( paste() ) ); } void TDEApplication::clear() { - invokeEditSlot( TQT_SLOT( clear() ) ); + invokeEditSlot( TQ_SLOT( clear() ) ); } void TDEApplication::selectAll() { - invokeEditSlot( TQT_SLOT( selectAll() ) ); + invokeEditSlot( TQ_SLOT( selectAll() ) ); } void TDEApplication::broadcastKeyCode(unsigned int keyCode) @@ -3072,8 +3070,8 @@ startServiceInternal( const TQCString &function, // Register app as able to send DCOP messages DCOPClient *dcopClient; - if (kapp) - dcopClient = kapp->dcopClient(); + if (tdeApp) + dcopClient = tdeApp->dcopClient(); else dcopClient = new DCOPClient; @@ -3083,7 +3081,7 @@ startServiceInternal( const TQCString &function, { if (error) *error = i18n("Could not register with DCOP.\n"); - if (!kapp) + if (!tdeApp) delete dcopClient; return -1; @@ -3096,7 +3094,7 @@ startServiceInternal( const TQCString &function, TQByteArray replyData; TQCString _launcher = TDEApplication::launcher(); TQValueList<TQCString> envs; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (tqt_xdisplay()) { TQCString dpystring(XDisplayString(tqt_xdisplay())); envs.append( TQCString("DISPLAY=") + dpystring ); @@ -3106,7 +3104,7 @@ startServiceInternal( const TQCString &function, } #endif stream << envs; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // make sure there is id, so that user timestamp exists stream << ( startup_id.isEmpty() ? TDEStartupInfo::createNewStartupId() : startup_id ); #endif @@ -3118,11 +3116,11 @@ startServiceInternal( const TQCString &function, { if (error) *error = i18n("TDELauncher could not be reached via DCOP.\n"); - if (!kapp) + if (!tdeApp) delete dcopClient; return -1; } - if (!kapp) + if (!tdeApp) delete dcopClient; if (noWait) @@ -3345,8 +3343,8 @@ void TDEApplication::setTopWidget( TQWidget *topWidget ) // set the specified icons topWidget->setIcon( icon() ); //standard X11 -#if defined Q_WS_X11 -//#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded +#if defined TQ_WS_X11 +//#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons(topWidget->winId(), icon(), miniIcon() ); // NET_WM hints for KWin // set the app startup notification window property @@ -3363,7 +3361,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) { if( startup_id == d->startup_id ) return; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed #endif if( startup_id.isEmpty()) @@ -3371,7 +3369,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) else { d->startup_id = startup_id; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id; id.initId( startup_id ); long timestamp = id.timestamp(); @@ -3385,7 +3383,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id ) // not to propagate it to processes started from this app void TDEApplication::read_app_startup_id() { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id = TDEStartupInfo::currentStartupIdEnv(); TDEStartupInfo::resetStartupEnv(); d->startup_id = id.id(); @@ -3593,7 +3591,7 @@ bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_bas uint TDEApplication::keyboardModifiers() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; @@ -3612,13 +3610,13 @@ uint TDEApplication::keyboardModifiers() uint TDEApplication::mouseState() { uint mousestate; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &mousestate ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON); if (GetAsyncKeyState(VK_LBUTTON)) mousestate |= (mousebtn_swapped ? Button3Mask : Button1Mask); @@ -3626,7 +3624,7 @@ uint TDEApplication::mouseState() mousestate |= Button2Mask; if (GetAsyncKeyState(VK_RBUTTON)) mousestate |= (mousebtn_swapped ? Button1Mask : Button3Mask); -#elif defined(Q_WS_MACX) +#elif defined(TQ_WS_MACX) mousestate = GetCurrentEventButtonState(); #else //TODO: other platforms @@ -3634,10 +3632,10 @@ uint TDEApplication::mouseState() return mousestate & 0xff00; } -TQ_ButtonState TDEApplication::keyboardMouseState() +TQt::ButtonState TDEApplication::keyboardMouseState() { int ret = 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Window root; Window child; int root_x, root_y, win_x, win_y; @@ -3646,52 +3644,52 @@ TQ_ButtonState TDEApplication::keyboardMouseState() &root_x, &root_y, &win_x, &win_y, &state ); // transform the same way like Qt's qt_x11_translateButtonState() if( state & Button1Mask ) - ret |= TQ_LeftButton; + ret |= LeftButton; if( state & Button2Mask ) - ret |= TQ_MidButton; + ret |= MidButton; if( state & Button3Mask ) - ret |= TQ_RightButton; + ret |= RightButton; if( state & ShiftMask ) - ret |= TQ_ShiftButton; + ret |= ShiftButton; if( state & ControlMask ) - ret |= TQ_ControlButton; + ret |= ControlButton; if( state & KKeyNative::modX( KKey::ALT )) - ret |= TQ_AltButton; + ret |= AltButton; if( state & KKeyNative::modX( KKey::WIN )) - ret |= TQ_MetaButton; -#elif defined(Q_WS_WIN) + ret |= MetaButton; +#elif defined(TQ_WS_WIN) const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON); if (GetAsyncKeyState(VK_LBUTTON)) ret |= (mousebtn_swapped ? RightButton : LeftButton); if (GetAsyncKeyState(VK_MBUTTON)) - ret |= TQ_MidButton; + ret |= MidButton; if (GetAsyncKeyState(VK_RBUTTON)) - ret |= (mousebtn_swapped ? TQ_LeftButton : TQ_RightButton); + ret |= (mousebtn_swapped ? LeftButton : RightButton); if (GetAsyncKeyState(VK_SHIFT)) - ret |= TQ_ShiftButton; + ret |= ShiftButton; if (GetAsyncKeyState(VK_CONTROL)) - ret |= TQ_ControlButton; + ret |= ControlButton; if (GetAsyncKeyState(VK_MENU)) - ret |= TQ_AltButton; + ret |= AltButton; if (GetAsyncKeyState(VK_LWIN) || GetAsyncKeyState(VK_RWIN)) - ret |= TQ_MetaButton; + ret |= MetaButton; #else //TODO: other platforms #endif return static_cast< ButtonState >( ret ); } -#if defined Q_WS_X11 +#if defined TQ_WS_X11 int TDEApplication::currentX11VT() { return get_x_vtnum(TQPaintDevice::x11AppDisplay()); } -#else // Q_WS_X11 +#else // TQ_WS_X11 int TDEApplication::currentX11VT() { return -1; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 void TDEApplication::installSigpipeHandler() { @@ -3722,7 +3720,7 @@ void TDEApplication::sigpipeHandler(int) bool TDEApplication::guiEnabled() { - return kapp && kapp->d->guiEnabled; + return tdeApp && tdeApp->d->guiEnabled; } void TDEApplication::virtual_hook( int id, void* data ) diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 1b4fbe097..171ae2eec 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (c) 1998, 1999 KDE Team @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _TDEAPP_H -#define _TDEAPP_H +#ifndef __TDEAPPLICATION_H__ +#define __TDEAPPLICATION_H__ // Version macros. Never put this further down. #include "tdeversion.h" @@ -30,16 +30,14 @@ class KCharsets; class DCOPClient; class DCOPObject; -#include <tqtglobaldefines.h> - typedef unsigned long Atom; -#if !defined(Q_WS_X11) +#if !defined(TQ_WS_X11) typedef void Display; #endif #include <tqapplication.h> #include <tqpixmap.h> -#include <kinstance.h> +#include <tdeinstance.h> struct _IceConn; class TQPopupMenu; @@ -48,7 +46,7 @@ class KSessionManaged; class TDEStyle; class KURL; -#define kapp TDEApplication::kApplication() +#define tdeApp TDEApplication::tdeApplication() class TDEApplicationPrivate; @@ -56,7 +54,7 @@ class TDEApplicationPrivate; * Controls and provides information to all KDE applications. * * Only one object of this class can be instantiated in a single app. -* This instance is always accessible via the 'kapp' global variable. +* This instance is always accessible via the 'tdeApp' global variable. * See cut() for an example. * * This class provides the following services to all KDE applications. @@ -96,7 +94,7 @@ class TDEApplicationPrivate; class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance { - Q_OBJECT + TQ_OBJECT public: /** Position of the caption (presumably in the application window's * title bar). This enum appears to be unused. @@ -140,7 +138,7 @@ public: #endif // TDEAPPLICATION_BINARY_COMPAT_HACK #endif // Q_QDOC -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Constructor. Parses command-line arguments. Use this constructor when you * you want ARGB support to be automatically detected and enabled. @@ -187,7 +185,7 @@ public: * * @see RGBADisplay() */ - TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles); + TDEApplication(Display *display, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles); /** * Constructor. Parses command-line arguments. Use this constructor when you @@ -212,7 +210,7 @@ public: * * @since KDE 3.3 */ - TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, + TDEApplication(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true); /** @@ -268,7 +266,7 @@ public: // REMOVE FOR KDE 4.0 - using it only gives crashing applications because // TDECmdLineArgs::init isn't called TDEApplication(int& argc, char** argv, - const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED; + const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) TDE_DEPRECATED; #ifdef Q_QDOC #else // Q_QDOC @@ -277,7 +275,7 @@ public: // FOR BINARY COMPATIBILITY ONLY // REMOVE WHEN PRACTICAL! TDEApplication(int& argc, char** argv, - const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED; + const TQCString& rAppName, bool allowStyles, bool GUIenabled) TDE_DEPRECATED; #endif // TDEAPPLICATION_BINARY_COMPAT_HACK #endif // Q_QDOC @@ -298,7 +296,7 @@ public: * to every function that may require it. * @return the current application object */ - static TDEApplication* kApplication() { return KApp; } + static TDEApplication* tdeApplication() { return TDEApp; } /** * Returns the application session config object. @@ -545,7 +543,7 @@ public: * value will be appended to the filename, * prefixed with a "#" (hash) character. */ - void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const KDE_DEPRECATED; + void invokeHTMLHelp( const TQString& aFilename, const TQString& aTopic = TQString::null ) const TDE_DEPRECATED; /** * Convenience method; invokes the standard email application. @@ -621,7 +619,7 @@ public slots: * If the widget with focus provides a cut() slot, call that slot. Thus for a * simple application cut can be implemented as: * \code - * KStdAction::cut( kapp, TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::cut( tdeApp, TQ_SLOT( cut() ), actionCollection() ); * \endcode */ void cut(); @@ -630,7 +628,7 @@ public slots: * If the widget with focus provides a copy() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::copy( kapp, TQT_SLOT( copy() ), actionCollection() ); + * KStdAction::copy( tdeApp, TQ_SLOT( copy() ), actionCollection() ); * \endcode */ void copy(); @@ -639,7 +637,7 @@ public slots: * If the widget with focus provides a paste() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::paste( kapp, TQT_SLOT( paste() ), actionCollection() ); + * KStdAction::paste( tdeApp, TQ_SLOT( paste() ), actionCollection() ); * \endcode */ void paste(); @@ -648,7 +646,7 @@ public slots: * If the widget with focus provides a clear() slot, call that slot. Thus for a * simple application clear() can be implemented as: * \code - * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); + * new TDEAction( i18n( "Clear" ), "edit-clear", 0, tdeApp, TQ_SLOT( clear() ), actionCollection(), "clear" ); * \endcode * * Note that for some widgets, this may not provide the intended bahavior. For @@ -660,7 +658,7 @@ public slots: * * \code * class MyListView : public TDEListView { - * Q_OBJECT + * TQ_OBJECT * public: * MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {} * virtual ~MyListView() {} @@ -675,7 +673,7 @@ public slots: * If the widget with focus provides a selectAll() slot, call that slot. Thus for a * simple application select all can be implemented as: * \code - * KStdAction::selectAll( kapp, TQT_SLOT( selectAll() ), actionCollection() ); + * KStdAction::selectAll( tdeApp, TQ_SLOT( selectAll() ), actionCollection() ); * \endcode */ void selectAll(); @@ -893,14 +891,14 @@ public: /** * @deprecated */ - KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; } + TDE_DEPRECATED TDEStyle* tdestyle() const { return 0; } /** * Builds a caption that contains the application name along with the * userCaption using a standard layout. * * To make a compliant caption - * for your window, simply do: @p setCaption(kapp->makeStdCaption(yourCaption)); + * for your window, simply do: @p setCaption(tdeApp->makeStdCaption(yourCaption)); * * @param userCaption The caption string you want to display in the * window caption area. Do not include the application name! @@ -935,7 +933,7 @@ public: */ TQString checkRecoverFile( const TQString& pFilename, bool& bRecover ) const; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) /** * @internal * Get the X11 display @@ -964,7 +962,7 @@ public: * Note that calling this method will probably cause the screen to flicker. * @see isCompositionManagerAvailable() * @param force_available If set, force TDE to assume a composition manager is available - * @param available Whether or not the composition manager is available (only used if force_available is TRUE) + * @param available Whether or not the composition manager is available (only used if force_available is true) * @return whether the composition manager is enabled */ bool detectCompositionManagerAvailable(bool force_available=false, bool available=true); @@ -984,14 +982,14 @@ public: * * @return A pointer to the X11 display visual */ - Qt::HANDLE getX11RGBAVisual(Display *dpy); + TQt::HANDLE getX11RGBAVisual(Display *dpy); /** * Returns the X11 display colormap * * @return An X11 display colormap object */ - Qt::HANDLE getX11RGBAColormap(Display *dpy); + TQt::HANDLE getX11RGBAColormap(Display *dpy); /** * Returns whether or not X11 composition is available @@ -1219,7 +1217,7 @@ public: * @deprecated Use keyboardMouseState() * @since 3.1 */ - static uint keyboardModifiers() KDE_DEPRECATED; + static uint keyboardModifiers() TDE_DEPRECATED; /** @deprecated Same values as Button1Mask etc. in X.h */ enum { Button1Pressed = 1<<8, @@ -1231,7 +1229,7 @@ public: * @deprecated Use keyboardMouseState() * @since 3.1 */ - static uint mouseState() KDE_DEPRECATED; + static uint mouseState() TDE_DEPRECATED; /** * Returns the VT that the current X server is running on, or -1 if this information is unavailable. @@ -1258,15 +1256,15 @@ public slots: protected: /** - * @internal Used by KUniqueApplication + * @internal Used by TDEUniqueApplication */ TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** - * @internal Used by KUniqueApplication + * @internal Used by TDEUniqueApplication */ - TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, + TDEApplication( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles, TDEInstance* _instance ); /** @@ -1280,14 +1278,14 @@ protected: int kipcEventMask; /// Current application object. - static TDEApplication *KApp; + static TDEApplication *TDEApp; int pArgc; /** * This method is used internally to determine which edit slots are implemented * by the widget that has the focus, and to invoke those slots if available. * - * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() ) + * @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT( cut() ) * * This method can be used in TDEApplication subclasses to implement application wide * edit actions not supported by the TDEApplication class. For example (in your subclass): @@ -1295,7 +1293,7 @@ protected: * \code * void MyApplication::deselect() * { - * invokeEditSlot( TQT_SLOT( deselect() ) ); + * invokeEditSlot( TQ_SLOT( deselect() ) ); * } * \endcode * @@ -1303,7 +1301,7 @@ protected: * focused widget if it provides this slot. You can combine this with TDEAction with: * * \code - * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::deselect( static_cast<MyApplication *>( tdeApp ), TQ_SLOT( cut() ), actionCollection() ); * \endcode * * @see cut() @@ -1352,9 +1350,9 @@ private: void initUrlActionRestrictions(); bool argb_visual; -#if defined(Q_WS_X11) - Qt::HANDLE argb_x11_visual; - Qt::HANDLE argb_x11_colormap; +#if defined(TQ_WS_X11) + TQt::HANDLE argb_x11_visual; + TQt::HANDLE argb_x11_colormap; #endif public: @@ -1452,7 +1450,7 @@ signals: * connect to this to monitor global font changes, especially if you are * using explicit fonts. * - * Note: If you derive from a QWidget-based class, a faster method is to + * Note: If you derive from a TQWidget-based class, a faster method is to * reimplement TQWidget::fontChange(). This is the preferred way * to get informed about font updates. */ diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp index 0b9e2693f..af28d0057 100644 --- a/tdecore/tdecmdlineargs.cpp +++ b/tdecore/tdecmdlineargs.cpp @@ -43,13 +43,13 @@ #include <kstringhandler.h> #include <kstaticdeleter.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define DISPLAY "DISPLAY" -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) #define DISPLAY "QWS_DISPLAY" #endif -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <win32_utils.h> #endif @@ -125,20 +125,20 @@ bool TDECmdLineArgs::ignoreUnknown = false; void TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName, - const char *_description, const char *_version, bool noKApp) + const char *_description, const char *_version, bool noTDEApp) { init(_argc, _argv, new TDEAboutData(_appname, programName, _version, _description), - noKApp); + noTDEApp); } void TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, - const char *_description, const char *_version, bool noKApp) + const char *_description, const char *_version, bool noTDEApp) { init(_argc, _argv, new TDEAboutData(_appname, _appname, _version, _description), - noKApp); + noTDEApp); } void @@ -159,7 +159,7 @@ TDECmdLineArgs::init(const TDEAboutData* ab) void -TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool noKApp) +TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool noTDEApp) { argc = _argc; argv = _argv; @@ -184,10 +184,10 @@ TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool n parsed = false; mCwd = mCwdd.setObject(mCwd, new char [PATH_MAX+1], true); (void) getcwd(mCwd, PATH_MAX); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN win32_slashify(mCwd, PATH_MAX); #endif - if (!noKApp) + if (!noTDEApp) TDEApplication::addCmdLineOptions(); } @@ -926,7 +926,7 @@ TDECmdLineArgs::usage(const char *id) name = name.mid(1); if ((name[0] == '[') && (name[name.length()-1] == ']')) name = name.mid(1, name.length()-2); - printQ(optionFormatString.arg(QString(name), -25) + printQ(optionFormatString.arg(TQString(name), -25) .arg(description)); } else @@ -950,12 +950,12 @@ TDECmdLineArgs::usage(const char *id) opt = opt + name; if (!option->def) { - printQ(optionFormatString.arg(QString(opt), -25) + printQ(optionFormatString.arg(TQString(opt), -25) .arg(description)); } else { - printQ(optionFormatStringDef.arg(QString(opt), -25) + printQ(optionFormatStringDef.arg(TQString(opt), -25) .arg(description).arg(option->def)); } opt = ""; @@ -1099,7 +1099,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, const char *value) addArgument(arg); addArgument(value); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // Hack coming up! if (arg == "-display") { diff --git a/tdecore/tdecmdlineargs.h b/tdecore/tdecmdlineargs.h index 8705b4d35..c494c206f 100644 --- a/tdecore/tdecmdlineargs.h +++ b/tdecore/tdecmdlineargs.h @@ -69,7 +69,7 @@ struct TDECORE_EXPORT TDECmdLineOptions class TDECmdLineArgsList; class TDEApplication; -class KUniqueApplication; +class TDEUniqueApplication; class TDECmdLineParsedOptions; class TDECmdLineParsedArgs; class TDEAboutData; @@ -97,19 +97,19 @@ class TDECmdLineArgsPrivate; * TDECmdLineArgs::addCmdLineOptions( options ); * * // Add options from other components - * KUniqueApplication::addCmdLineOptions(); + * TDEUniqueApplication::addCmdLineOptions(); * * .... * * // Create application object without passing 'argc' and 'argv' again. - * KUniqueApplication app; + * TDEUniqueApplication app; * * .... * * // Handle our own options/arguments * // A TDEApplication will usually do this in main but this is not * // necessary. - * // A KUniqueApplication might want to handle it in newInstance(). + * // A TDEUniqueApplication might want to handle it in newInstance(). * * TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); * @@ -222,7 +222,7 @@ class TDECmdLineArgsPrivate; class TDECORE_EXPORT TDECmdLineArgs { friend class TDEApplication; - friend class KUniqueApplication; + friend class TDEUniqueApplication; friend class TQPtrList<TDECmdLineArgs>; public: // Static functions: @@ -241,14 +241,14 @@ public: * translation. Example: I18N_NOOP("KEdit") * @param _description A short description of what your application is about. * @param _version A version. - * @param noKApp Set this true to not add commandline options for + * @param noTDEApp Set this true to not add commandline options for * TQApplication / TDEApplication * * @since 3.2 */ static void init(int _argc, char **_argv, const char *_appname, const char* programName, const char *_description, - const char *_version, bool noKApp = false); + const char *_version, bool noTDEApp = false); /** * @deprecated * You should convert any calls to this method to use the one @@ -257,7 +257,7 @@ public: */ static void init(int _argc, char **_argv, const char *_appname, const char *_description, - const char *_version, bool noKApp = false) KDE_DEPRECATED; + const char *_version, bool noTDEApp = false) TDE_DEPRECATED; /** * Initialize class. @@ -269,11 +269,11 @@ public: * @param _argc As passed to @p main(...). * @param _argv As passed to @p main(...). * @param about A TDEAboutData object describing your program. - * @param noKApp Set this true to not add commandline options for + * @param noTDEApp Set this true to not add commandline options for * TQApplication / TDEApplication */ static void init(int _argc, char **_argv, - const TDEAboutData *about, bool noKApp = false); + const TDEAboutData *about, bool noTDEApp = false); /** * Initialize Class @@ -373,7 +373,7 @@ public: * Get the CWD (Current Working Directory) associated with the * current command line arguments. * - * Typically this is needed in KUniqueApplication::newInstance() + * Typically this is needed in TDEUniqueApplication::newInstance() * since the CWD of the process may be different from the CWD * where the user started a second instance. * @return the current working directory @@ -606,7 +606,7 @@ private: static void removeArgs(const char *id); /** - * @internal for KUniqueApplication only: + * @internal for TDEUniqueApplication only: * * Save all but the Qt and KDE arguments to a stream. */ diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp index 68307dc85..4f67d5681 100644 --- a/tdecore/tdeconfig.cpp +++ b/tdecore/tdeconfig.cpp @@ -37,7 +37,7 @@ #include "tdeconfig.h" #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kstaticdeleter.h" #include <tqtimer.h> diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h index 2ae0549de..7d535e38b 100644 --- a/tdecore/tdeconfig.h +++ b/tdecore/tdeconfig.h @@ -37,12 +37,12 @@ class TDEConfigPrivate; * This class implements KDE's default configuration system. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> -* @see TDEGlobal::config(), TDEConfigBase, KSimpleConfig +* @see TDEGlobal::config(), TDEConfigBase, TDESimpleConfig * @short KDE Configuration Management class */ class TDECORE_EXPORT TDEConfig : public TDEConfigBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox index 1b4926e96..ad02f29b3 100644 --- a/tdecore/tdeconfig_compiler/README.dox +++ b/tdecore/tdeconfig_compiler/README.dox @@ -104,7 +104,7 @@ The following options are read from the kcfgc file: <td><b>Visibility</b></td> <td>string</td> <td>-</td> - <td>Inserts visibility directive (for example KDE_EXPORT) between "class" keyword and class + <td>Inserts visibility directive (for example TDE_EXPORT) between "class" keyword and class name in header file</td> </tr> <tr> @@ -213,8 +213,8 @@ color_3=#ffff00 \endverbatim The configuration options will be accessible to the application via -a QColor color(int ColorIndex) and a -void setColor(int ColorIndex, const QColor &v) function. +a TQColor color(int ColorIndex) and a +void setColor(int ColorIndex, const TQColor &v) function. Example 2: \verbatim @@ -239,8 +239,8 @@ sound_Crash=crash.wav sound_Missile=missile.wav The configuration options will be accessible to the application via -a QString sound(int SoundEvent) and a -void setSound(int SoundEvent, const QString &v) function. +a TQString sound(int SoundEvent) and a +void setSound(int SoundEvent, const TQString &v) function. - Parameterized groups diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp index 6085fa6eb..ee1233e54 100644 --- a/tdecore/tdeconfig_compiler/example/autoexample.cpp +++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp @@ -31,7 +31,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tqlabel.h> diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp index 157570d98..662e60d0f 100644 --- a/tdecore/tdeconfig_compiler/example/example.cpp +++ b/tdecore/tdeconfig_compiler/example/example.cpp @@ -28,7 +28,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> int main( int argc, char **argv ) { diff --git a/tdecore/tdeconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg index 076bfb644..346e652bb 100644 --- a/tdecore/tdeconfig_compiler/example/example.kcfg +++ b/tdecore/tdeconfig_compiler/example/example.kcfg @@ -35,7 +35,7 @@ </entry> <entry name="MyPath" type="Path"> <label>This is a path</label> - <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default> + <default code="true">QDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default> </entry> <entry name="MyPaths" type="PathList"> <label>This is a list of paths</label> diff --git a/tdecore/tdeconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui index 9b41370c7..9f9d8fbb1 100644 --- a/tdecore/tdeconfig_compiler/example/general_base.ui +++ b/tdecore/tdeconfig_compiler/example/general_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GeneralBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralBase</cstring> </property> diff --git a/tdecore/tdeconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui index 3c0c2e6cb..62f0356c5 100644 --- a/tdecore/tdeconfig_compiler/example/myoptions_base.ui +++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MyOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MyOptionsBase</cstring> </property> diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index 1c35c6ea3..a4f4bc9c0 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- /* This file is part of KDE. @@ -34,8 +33,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <iostream> @@ -995,7 +994,7 @@ int main( int argc, char **argv ) TQString baseName = args->url( 1 ).fileName(); baseName = baseName.left(baseName.length() - 6); - KSimpleConfig codegenConfig( codegenFilename, true ); + TDESimpleConfig codegenConfig( codegenFilename, true ); TQString nameSpace = codegenConfig.readEntry("NameSpace"); TQString className = codegenConfig.readEntry("ClassName"); diff --git a/tdecore/tdeconfig_compiler/tests/test1main.cpp b/tdecore/tdeconfig_compiler/tests/test1main.cpp index 79546639f..eaa9bc97b 100644 --- a/tdecore/tdeconfig_compiler/tests/test1main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test1main.cpp @@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test1.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test2main.cpp b/tdecore/tdeconfig_compiler/tests/test2main.cpp index 5970bf03d..46b85c6bf 100644 --- a/tdecore/tdeconfig_compiler/tests/test2main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test2main.cpp @@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test2.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test3main.cpp b/tdecore/tdeconfig_compiler/tests/test3main.cpp index f73ae38e3..262301b8b 100644 --- a/tdecore/tdeconfig_compiler/tests/test3main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test3main.cpp @@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test3.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test4main.cpp b/tdecore/tdeconfig_compiler/tests/test4main.cpp index 5229d8a87..92e34c328 100644 --- a/tdecore/tdeconfig_compiler/tests/test4main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test4main.cpp @@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test4.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test5main.cpp b/tdecore/tdeconfig_compiler/tests/test5main.cpp index 89f28587f..f9111cf24 100644 --- a/tdecore/tdeconfig_compiler/tests/test5main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test5main.cpp @@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test5.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test6main.cpp b/tdecore/tdeconfig_compiler/tests/test6main.cpp index 9b1b7503e..90c5de929 100644 --- a/tdecore/tdeconfig_compiler/tests/test6main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test6main.cpp @@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test6.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test7main.cpp b/tdecore/tdeconfig_compiler/tests/test7main.cpp index 81cca0184..522aa4ff6 100644 --- a/tdecore/tdeconfig_compiler/tests/test7main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test7main.cpp @@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test7.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp index 2611a48af..a338ea096 100644 --- a/tdecore/tdeconfig_compiler/tests/test8main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "test8a.h" #include "test8b.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfig_compiler/tests/test9main.cpp b/tdecore/tdeconfig_compiler/tests/test9main.cpp index 8668d8d8c..e49899bc1 100644 --- a/tdecore/tdeconfig_compiler/tests/test9main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test9main.cpp @@ -19,7 +19,7 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test9.h" -#include "kinstance.h" +#include "tdeinstance.h" #include <kdebug.h> #include <tqdir.h> diff --git a/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp index b62ee17af..a46f7ae50 100644 --- a/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp +++ b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp @@ -20,7 +20,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "test_dpointer.h" -#include "kinstance.h" +#include "tdeinstance.h" int main( int, char*[] ) { diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 3dd450061..707f4fe69 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -43,9 +43,9 @@ #include "tdeconfigbase.h" #include <tdeapplication.h> #include <tdeglobal.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <kurl.h> #include <kde_file.h> @@ -353,7 +353,7 @@ bool TDEConfigINIBackEnd::parseConfigFiles() TQStringList tdercs = TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("kdeglobals")); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" ); #else TQString etc_tderc = TQString::fromLatin1("/etc/tderc"); @@ -1178,7 +1178,7 @@ bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser) // Note: We don't ask the user if we should not ask this question again because we can't save the answer. errorMsg += i18n("Please contact your system administrator."); TQString cmdToExec = TDEStandardDirs::findExe(TQString("kdialog")); - TDEApplication *app = kapp; + TDEApplication *app = tdeApp; if (!cmdToExec.isEmpty() && app) { TDEProcess lprocess; diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h index c4149a69c..ab74f927f 100644 --- a/tdecore/tdeconfigbackend.h +++ b/tdecore/tdeconfigbackend.h @@ -159,7 +159,7 @@ private: /** * @deprecated Use fileName() instead */ - KDE_DEPRECATED TQString filename() const { return mfileName; } + TDE_DEPRECATED TQString filename() const { return mfileName; } protected: TDEConfigBase *pConfig; diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp index 9bca7145d..3f44fbc7e 100644 --- a/tdecore/tdeconfigbase.cpp +++ b/tdecore/tdeconfigbase.cpp @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* This file is part of the KDE libraries Copyright (c) 1999 Preston Brown <pbrown@kde.org> @@ -36,7 +35,7 @@ #include "tdeconfigbase.h" #include "tdeconfigbackend.h" #include "kdebug.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kstringhandler.h" class TDEConfigBase::TDEConfigBasePrivate @@ -436,7 +435,7 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, case TQVariant::DateTime: return TQVariant( readDateTimeEntry( pKey, &tmp.asDateTime() ) ); case TQVariant::Date: - return TQVariant(TQT_TQDATE_OBJECT(readDateTimeEntry( pKey, &tmp.asDateTime() ).date())); + return TQVariant(readDateTimeEntry( pKey, &tmp.asDateTime() ).date()); case TQVariant::Pixmap: case TQVariant::Image: @@ -452,35 +451,13 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey, case TQVariant::Cursor: case TQVariant::SizePolicy: case TQVariant::Time: -#ifdef USE_QT3 case TQVariant::ByteArray: -#endif // USE_QT3 case TQVariant::BitArray: case TQVariant::KeySequence: case TQVariant::Pen: -#ifdef USE_QT4 - case TQVariant::Char: - case TQVariant::Url: - case TQVariant::Locale: - case TQVariant::RectF: - case TQVariant::SizeF: - case TQVariant::Line: - case TQVariant::LineF: - case TQVariant::PointF: - case TQVariant::RegExp: - case TQVariant::Hash: - case TQVariant::TextLength: - case QVariant::TextFormat: - case TQVariant::Matrix: - case TQVariant::Transform: - case TQVariant::Matrix4x4: - case TQVariant::Vector2D: - case TQVariant::Vector3D: - case TQVariant::Vector4D: - case TQVariant::Quaternion: - case TQVariant::UserType: -#endif // USE_QT4 + { break; + } } Q_ASSERT( 0 ); @@ -982,7 +959,7 @@ TQColor TDEConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.at(0) == (QChar)'#' ) + if ( aValue.at(0) == (TQChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1123,7 +1100,7 @@ void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path, static bool cleanHomeDirPath( TQString &path, const TQString &homeDir ) { -#ifdef Q_WS_WIN //safer +#ifdef TQ_WS_WIN //safer if (!TQDir::convertSeparators(path).startsWith(TQDir::convertSeparators(homeDir))) return false; #else @@ -1377,35 +1354,13 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, case TQVariant::Cursor: case TQVariant::SizePolicy: case TQVariant::Time: -#ifdef USE_QT3 case TQVariant::ByteArray: -#endif // USE_QT3 case TQVariant::BitArray: case TQVariant::KeySequence: case TQVariant::Pen: -#ifdef USE_QT4 - case TQVariant::Char: - case TQVariant::Url: - case TQVariant::Locale: - case TQVariant::RectF: - case TQVariant::SizeF: - case TQVariant::Line: - case TQVariant::LineF: - case TQVariant::PointF: - case TQVariant::RegExp: - case TQVariant::Hash: - case TQVariant::TextLength: - case QVariant::TextFormat: - case TQVariant::Matrix: - case TQVariant::Transform: - case TQVariant::Matrix4x4: - case TQVariant::Vector2D: - case TQVariant::Vector3D: - case TQVariant::Vector4D: - case TQVariant::Quaternion: - case TQVariant::UserType: -#endif // USE_QT4 + { break; + } } Q_ASSERT( 0 ); @@ -1446,7 +1401,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (TQChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1490,7 +1445,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.at(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (TQChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } @@ -1754,8 +1709,8 @@ void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, TQStrList list; TQCString tempstr; - TQTime time = TQT_TQTIME_OBJECT(rDateTime.time()); - TQDate date = TQT_TQDATE_OBJECT(rDateTime.date()); + TQTime time = rDateTime.time(); + TQDate date = rDateTime.date(); list.insert( 0, tempstr.setNum( date.year() ) ); list.insert( 1, tempstr.setNum( date.month() ) ); diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h index a891409e7..d05064e73 100644 --- a/tdecore/tdeconfigbase.h +++ b/tdecore/tdeconfigbase.h @@ -45,7 +45,7 @@ class TDEConfigGroup; * This class forms the base for all %KDE configuration. It is an * abstract base class, meaning that you cannot directly instantiate * objects of this class. Either use TDEConfig (for usual %KDE - * configuration) or KSimpleConfig (for special needs as in ksamba), or + * configuration) or TDESimpleConfig (for special needs as in ksamba), or * even TDESharedConfig (stores values in shared memory). * * All configuration entries are key, value pairs. Each entry also @@ -64,12 +64,12 @@ class TDEConfigGroup; * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> * @see TDEGlobal#config() * @see TDEConfig - * @see KSimpleConfig + * @see TDESimpleConfig * @see TDESharedConfig */ class TDECORE_EXPORT TDEConfigBase : public TQObject { - Q_OBJECT + TQ_OBJECT friend class TDEConfigBackEnd; @@ -1885,7 +1885,7 @@ public: * If an application computes a default value at runtime for * a certain entry, e.g. like: * \code - * TQColor computedDefault = kapp->palette().color(TQPalette::Active, TQColorGroup::Text) + * TQColor computedDefault = tdeApp->palette().color(TQPalette::Active, TQColorGroup::Text) * TQColor color = config->readEntry(key, computedDefault); * \encode * @@ -2025,7 +2025,7 @@ protected: bool bDirty; bool bLocaleInitialized; - bool bReadOnly; // currently only used by KSimpleConfig + bool bReadOnly; // currently only used by TDESimpleConfig mutable bool bExpand; // whether dollar expansion is used protected: @@ -2044,11 +2044,11 @@ private: class TDEConfigGroupSaverPrivate; /** - * Helper class to facilitate working with TDEConfig / KSimpleConfig + * Helper class to facilitate working with TDEConfig / TDESimpleConfig * groups. * * Careful programmers always set the group of a - * TDEConfig KSimpleConfig object to the group they want to read from + * TDEConfig TDESimpleConfig object to the group they want to read from * and set it back to the old one of afterwards. This is usually * written as: * \code @@ -2075,8 +2075,8 @@ class TDEConfigGroupSaverPrivate; * way. * * @author Matthias Kalle Dalheimer <kalle@kde.org> - * @see TDEConfigBase, TDEConfig, KSimpleConfig, TDEConfigGroup - * @short Helper class for easier use of TDEConfig/KSimpleConfig groups + * @see TDEConfigBase, TDEConfig, TDESimpleConfig, TDEConfigGroup + * @short Helper class for easier use of TDEConfig/TDESimpleConfig groups */ class TDECORE_EXPORT TDEConfigGroupSaver // KDE4 remove diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp index 9578c05c1..3864dcdd6 100644 --- a/tdecore/tdeconfigdialogmanager.cpp +++ b/tdecore/tdeconfigdialogmanager.cpp @@ -53,7 +53,7 @@ TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkelet { d = new Private(); - kapp->installKDEPropertyMap(); + tdeApp->installKDEPropertyMap(); propertyMap = TQSqlPropertyMap::defaultMap(); init(true); @@ -69,52 +69,52 @@ void TDEConfigDialogManager::init(bool trackChanges) if(trackChanges) { // QT - changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQCheckBox", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQPushButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQRadioButton", TQ_SIGNAL(stateChanged(int))); // We can only store one thing, so you can't have // a ButtonGroup that is checkable. - changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int))); - changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool))); - changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int))); + changedMap.insert("TQButtonGroup", TQ_SIGNAL(clicked(int))); + changedMap.insert("TQGroupBox", TQ_SIGNAL(toggled(bool))); + changedMap.insert("TQComboBox", TQ_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged())); - changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert("TQComboBox", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQDateEdit", TQ_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert("TQDateTimeEdit", TQ_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert("TQDial", TQ_SIGNAL(valueChanged (int))); + changedMap.insert("TQLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQSlider", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQSpinBox", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQTimeEdit", TQ_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert("TQTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert("TQMultiLineEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert("TQTabWidget", TQ_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "TDEFontChooser", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int))); - - changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( "KDatePicker", TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate))); - changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &))); - changedMap.insert( "KEditListBox", TQT_SIGNAL(changed())); - changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged())); - changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( "KTextEdit", TQT_SIGNAL(textChanged())); - changedMap.insert( "KURLRequester", TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( "KIntNumInput", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KIntSpinBox", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double))); + changedMap.insert( "KComboBox", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontCombo", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontRequester", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "TDEFontChooser", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "KHistoryCombo", TQ_SIGNAL(activated (int))); + + changedMap.insert( "KColorButton", TQ_SIGNAL(changed(const TQColor &))); + changedMap.insert( "KDatePicker", TQ_SIGNAL(dateSelected (TQDate))); + changedMap.insert( "KDateWidget", TQ_SIGNAL(changed (TQDate))); + changedMap.insert( "KDateTimeWidget", TQ_SIGNAL(valueChanged (const TQDateTime &))); + changedMap.insert( "KEditListBox", TQ_SIGNAL(changed())); + changedMap.insert( "TDEListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert( "KLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KPasswordEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KRestrictedLine", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( "KTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert( "KURLRequester", TQ_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( "KIntNumInput", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KIntSpinBox", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KDoubleNumInput", TQ_SIGNAL(valueChanged (double))); } // Go through all of the children of the widgets and find all known widgets @@ -187,8 +187,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha { // If the class name of the widget wasn't in the monitored widgets map, then look for // it again using the super class name. This fixes a problem with using QtRuby/Korundum - // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even - // though it was a 'QWidget'. + // widgets with TDEConfigXT where 'TQt::Widget' wasn't being seen a the real deal, even + // though it was a 'TQWidget'. changedIt = changedMap.find(childWidget->metaObject()->superClassName()); } @@ -199,7 +199,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha else { connect(childWidget, *changedIt, - this, TQT_SIGNAL(widgetModified())); + this, TQ_SIGNAL(widgetModified())); TQGroupBox *gb = dynamic_cast<TQGroupBox *>(childWidget); if (!gb) @@ -209,8 +209,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQComboBox *cb = dynamic_cast<TQComboBox *>(childWidget); if (cb && cb->editable()) - connect(cb, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(widgetModified())); + connect(cb, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(widgetModified())); } } else @@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl; } } - else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING)) + else if (childWidget->inherits("TQLabel")) { TQLabel *label = static_cast<TQLabel *>(childWidget); TQWidget *buddy = label->buddy(); @@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className()); if (changedIt != changedMap.end()) { - if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) && - !childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) + if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && + !childWidget->inherits("TQGroupBox")) kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl; } } @@ -291,7 +291,7 @@ void TDEConfigDialogManager::updateWidgets() blockSignals(bSignalsBlocked); if (changed) - TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified())); + TQTimer::singleShot(0, this, TQ_SIGNAL(widgetModified())); } void TDEConfigDialogManager::updateWidgetsDefault() diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h index ecb3640ea..8f142f1f9 100644 --- a/tdecore/tdeconfigdialogmanager.h +++ b/tdecore/tdeconfigdialogmanager.h @@ -63,7 +63,7 @@ class TQSqlPropertyMap; * To add KColorButton the following code would be inserted in the main. * * \code - * kapp->installKDEPropertyMap(); + * tdeApp->installKDEPropertyMap(); * TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); * map->insert("KColorButton", "color"); * \endcode @@ -77,7 +77,7 @@ class TQSqlPropertyMap; */ class TDECORE_EXPORT TDEConfigDialogManager : public TQObject { -Q_OBJECT +TQ_OBJECT signals: /** diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp index 03dac6156..dafe485fc 100644 --- a/tdecore/tdeconfigskeleton.cpp +++ b/tdecore/tdeconfigskeleton.cpp @@ -23,7 +23,7 @@ #include <tqvariant.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <kdebug.h> diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h index 825c74400..d1c2f5a33 100644 --- a/tdecore/tdeconfigskeleton.h +++ b/tdecore/tdeconfigskeleton.h @@ -791,7 +791,7 @@ public: * Constructor. * * @param configname name of config file. If no name is given, the default - * config file as returned by kapp()->config() is used. + * config file as returned by tdeApp()->config() is used. */ TDEConfigSkeleton(const TQString & configname = TQString::null); diff --git a/tdecore/kcrash.cpp b/tdecore/tdecrash.cpp index 6fb5e8ff7..b1dc62957 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/tdecrash.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the KDE Libraries + * This file is part of the TDE Libraries * Copyright (C) 2000 Timo Hummel <timo.hummel@sap.com> * Tom Braun <braunt@fh-konstanz.de> * @@ -33,7 +33,7 @@ #include <stdlib.h> #include <unistd.h> #include <time.h> -#include "kcrash.h" +#include "tdecrash.h" #include <sys/types.h> #include <sys/time.h> @@ -45,7 +45,7 @@ #include <tqwindowdefs.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> #include <tdeapplication.h> @@ -53,7 +53,7 @@ #include <../tdeinit/tdelauncher_cmds.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -148,10 +148,10 @@ TDECrash::defaultCrashHandler (int sig) if (appName) { #ifndef NDEBUG - fprintf(stderr, "[kcrash] TDECrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter); - fprintf(stderr, "[kcrash] TDECrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid()); + fprintf(stderr, "[tdecrash] TDECrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter); + fprintf(stderr, "[tdecrash] TDECrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid()); #else - fprintf(stderr, "[kcrash] TDECrash: Application '%s' crashing...\n", appName ? appName : "<unknown>"); + fprintf(stderr, "[tdecrash] TDECrash: Application '%s' crashing...\n", appName ? appName : "<unknown>"); #endif const char * argv[24]; // don't forget to update this @@ -160,14 +160,14 @@ TDECrash::defaultCrashHandler (int sig) // argument 0 has to be drkonqi argv[i++] = "drkonqi"; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // start up on the correct display argv[i++] = "-display"; if ( tqt_xdisplay() ) argv[i++] = XDisplayString(tqt_xdisplay()); else argv[i++] = getenv("DISPLAY"); -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) // start up on the correct display argv[i++] = "-display"; argv[i++] = getenv("QWS_DISPLAY"); @@ -215,9 +215,9 @@ TDECrash::defaultCrashHandler (int sig) } } - if ( kapp && !kapp->startupId().isNull()) { + if ( tdeApp && !tdeApp->startupId().isNull()) { argv[i++] = "--startupid"; - argv[i++] = kapp->startupId().data(); + argv[i++] = tdeApp->startupId().data(); } if ( safer ) @@ -231,13 +231,13 @@ TDECrash::defaultCrashHandler (int sig) } else { - fprintf(stderr, "[kcrash] Unknown appname\n"); + fprintf(stderr, "[tdecrash] Unknown appname\n"); } } if (crashRecursionCounter < 4) { - fprintf(stderr, "[kcrash] Unable to start Dr. Konqi\n"); + fprintf(stderr, "[tdecrash] Unable to start Dr. Konqi\n"); } #endif //Q_OS_UNIX @@ -277,7 +277,7 @@ void TDECrash::startDrKonqi( const char* argv[], int argc ) int len = strlen( argv[ i ] ) + 1; // include terminating \0 if( pos + len > BUFSIZE ) { - fprintf( stderr, "[kcrash] BUFSIZE in TDECrash not big enough!\n" ); + fprintf( stderr, "[tdecrash] BUFSIZE in TDECrash not big enough!\n" ); startDirectly( argv, argc ); return; } @@ -317,7 +317,7 @@ void TDECrash::startDrKonqi( const char* argv[], int argc ) // If we can't reach tdeinit we can still at least try to fork() void TDECrash::startDirectly( const char* argv[], int ) { - fprintf( stderr, "[kcrash] TDECrash cannot reach tdeinit, launching directly.\n" ); + fprintf( stderr, "[tdecrash] TDECrash cannot reach tdeinit, launching directly.\n" ); pid_t pid = fork(); if (pid <= 0) { @@ -351,9 +351,9 @@ static char *getDisplay() /* don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in tqglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers TQ_WS_QWS, but we don't want to include that here) (Simon) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 */ #if !defined(QWS) display = getenv("DISPLAY"); @@ -448,12 +448,12 @@ static int openSocket() { if (!home_dir || !home_dir[0]) { - fprintf(stderr, "[kcrash] Warning: $HOME not set!\n"); + fprintf(stderr, "[tdecrash] Warning: $HOME not set!\n"); return -1; } if (strlen(home_dir) > (MAX_SOCK_FILE-100)) { - fprintf(stderr, "[kcrash] Warning: Home directory path too long!\n"); + fprintf(stderr, "[tdecrash] Warning: Home directory path too long!\n"); return -1; } kde_home++; @@ -470,7 +470,7 @@ static int openSocket() strncat(sock_file, getenv("XAUTHLOCALHOSTNAME"), MAX_SOCK_FILE - strlen(sock_file) - 1); else if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0) { - perror("[kcrash] Warning: Could not determine hostname: "); + perror("[tdecrash] Warning: Could not determine hostname: "); return -1; } sock_file[sizeof(sock_file)-1] = '\0'; @@ -479,13 +479,13 @@ static int openSocket() display = getDisplay(); if (display == NULL) { - fprintf(stderr, "[kcrash] Error: Could not determine display.\n"); + fprintf(stderr, "[tdecrash] Error: Could not determine display.\n"); return -1; } if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE) { - fprintf(stderr, "[kcrash] Warning: Socket name will be too long.\n"); + fprintf(stderr, "[tdecrash] Warning: Socket name will be too long.\n"); free(display); return -1; } @@ -495,7 +495,7 @@ static int openSocket() if (strlen(sock_file) >= sizeof(server.sun_path)) { - fprintf(stderr, "[kcrash] Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n"); + fprintf(stderr, "[tdecrash] Warning: Path of socketfile exceeds UNIX_PATH_MAX.\n"); return -1; } @@ -505,7 +505,7 @@ static int openSocket() s = socket(PF_UNIX, SOCK_STREAM, 0); if (s < 0) { - perror("[kcrash] Warning: socket creation failed: "); + perror("[tdecrash] Warning: socket creation failed: "); return -1; } @@ -514,7 +514,7 @@ static int openSocket() socklen = sizeof(server); if(connect(s, (struct sockaddr *)&server, socklen) == -1) { - perror("[kcrash] Warning: socket connection failed: "); + perror("[tdecrash] Warning: socket connection failed: "); close(s); return -1; } diff --git a/tdecore/kcrash.h b/tdecore/tdecrash.h index 0ea938bfe..68caf6dd8 100644 --- a/tdecore/kcrash.h +++ b/tdecore/tdecrash.h @@ -1,5 +1,5 @@ /* - * This file is part of the KDE Libraries + * This file is part of the TDE Libraries * Copyright (C) 2000 Timo Hummel <timo.hummel@sap.com> * Tom Braun <braunt@fh-konstanz.de> * This library is free software; you can redistribute it and/or @@ -19,8 +19,8 @@ * */ -#ifndef __KCRASH_H -#define __KCRASH_H +#ifndef __TDECRASH_H +#define __TDECRASH_H #include <tqstring.h> #include "tdelibs_export.h" @@ -98,7 +98,7 @@ class TDECORE_EXPORT TDECrash * @param path the application path. */ static void setApplicationPath (TQString path) { appPath = tqstrdup(path.local8Bit().data()); } - /* KDE 4: Make it const TQString & */ + /* Future: Make it const TQString & */ /** * Sets the application name @p name which should be passed to @@ -106,7 +106,7 @@ class TDECORE_EXPORT TDECrash * @param name the name of the application, as shown in Dr. Konqi */ static void setApplicationName (TQString name) { appName = tqstrdup(name.local8Bit().data()); } - /* KDE 4: Make it const TQString & */ + /* Future: Make it const TQString & */ protected: /** diff --git a/tdecore/kdesktopfile.cpp b/tdecore/tdedesktopfile.cpp index fa1626701..7bb9bcbe2 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/tdedesktopfile.cpp @@ -32,15 +32,15 @@ #include "kurl.h" #include "tdeconfigbackend.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kmountpoint.h" #include "kcatalogue.h" #include "tdelocale.h" -#include "kdesktopfile.h" -#include "kdesktopfile.moc" +#include "tdedesktopfile.h" +#include "tdedesktopfile.moc" -KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, +TDEDesktopFile::TDEDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { @@ -53,12 +53,12 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, setDesktopGroup(); } -KDesktopFile::~KDesktopFile() +TDEDesktopFile::~TDEDesktopFile() { // no need to do anything } -TQString KDesktopFile::locateLocal(const TQString &path) +TQString TDEDesktopFile::locateLocal(const TQString &path) { TQString local; if (path.endsWith(".directory")) @@ -110,7 +110,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) return local; } -bool KDesktopFile::isDesktopFile(const TQString& path) +bool TDEDesktopFile::isDesktopFile(const TQString& path) { int len = path.length(); @@ -122,9 +122,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path) return false; } -bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) +bool TDEDesktopFile::isAuthorizedDesktopFile(const TQString& path) { - if (!kapp || kapp->authorize("run_desktop_files")) + if (!tdeApp || tdeApp->authorize("run_desktop_files")) return true; if (path.isEmpty()) @@ -147,7 +147,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) return false; } -TQString KDesktopFile::translatedEntry(const char* key) const +TQString TDEDesktopFile::translatedEntry(const char* key) const { if (hasTranslatedKey(key)) return readEntry(key); @@ -168,42 +168,42 @@ TQString KDesktopFile::translatedEntry(const char* key) const return TQString::null; } -TQString KDesktopFile::readType() const +TQString TDEDesktopFile::readType() const { return readEntry("Type"); } -TQString KDesktopFile::readIcon() const +TQString TDEDesktopFile::readIcon() const { return readEntry("Icon"); } -TQString KDesktopFile::readName() const +TQString TDEDesktopFile::readName() const { return translatedEntry("Name"); } -TQString KDesktopFile::readComment() const +TQString TDEDesktopFile::readComment() const { return translatedEntry("Comment"); } -TQString KDesktopFile::readGenericName() const +TQString TDEDesktopFile::readGenericName() const { return translatedEntry("GenericName"); } -TQString KDesktopFile::readPath() const +TQString TDEDesktopFile::readPath() const { return readPathEntry("Path"); } -TQString KDesktopFile::readDevice() const +TQString TDEDesktopFile::readDevice() const { return readEntry("Dev"); } -TQString KDesktopFile::readURL() const +TQString TDEDesktopFile::readURL() const { if (hasDeviceType()) { TQString device = readDevice(); @@ -234,43 +234,43 @@ TQString KDesktopFile::readURL() const } } -TQStringList KDesktopFile::readActions() const +TQStringList TDEDesktopFile::readActions() const { return readListEntry("Actions", ';'); } -void KDesktopFile::setActionGroup(const TQString &group) +void TDEDesktopFile::setActionGroup(const TQString &group) { setGroup(TQString::fromLatin1("Desktop Action ") + group); } -bool KDesktopFile::hasActionGroup(const TQString &group) const +bool TDEDesktopFile::hasActionGroup(const TQString &group) const { return hasGroup(TQString::fromLatin1("Desktop Action ") + group); } -bool KDesktopFile::hasLinkType() const +bool TDEDesktopFile::hasLinkType() const { return readEntry("Type") == TQString::fromLatin1("Link"); } -bool KDesktopFile::hasApplicationType() const +bool TDEDesktopFile::hasApplicationType() const { return readEntry("Type") == TQString::fromLatin1("Application"); } -bool KDesktopFile::hasMimeTypeType() const +bool TDEDesktopFile::hasMimeTypeType() const { return readEntry("Type") == TQString::fromLatin1("MimeType"); } -bool KDesktopFile::hasDeviceType() const +bool TDEDesktopFile::hasDeviceType() const { return readEntry("Type") == TQString::fromLatin1("FSDev") || readEntry("Type") == TQString::fromLatin1("FSDevice"); } -bool KDesktopFile::tryExec() const +bool TDEDesktopFile::tryExec() const { // Test for TryExec and "X-TDE-AuthorizeAction" TQString te = readPathEntry("TryExec"); @@ -300,13 +300,13 @@ bool KDesktopFile::tryExec() const } } TQStringList list = readListEntry("X-TDE-AuthorizeAction"); - if (kapp && !list.isEmpty()) + if (tdeApp && !list.isEmpty()) { for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!kapp->authorize((*it).stripWhiteSpace())) + if (!tdeApp->authorize((*it).stripWhiteSpace())) return false; } } @@ -320,7 +320,7 @@ bool KDesktopFile::tryExec() const user = ::getenv("ADMIN_ACCOUNT"); if (user.isEmpty()) user = "root"; - if (!kapp->authorize("user/"+user)) + if (!tdeApp->authorize("user/"+user)) return false; } else { @@ -333,7 +333,7 @@ bool KDesktopFile::tryExec() const user = ::getenv("ADMIN_ACCOUNT"); if (user.isEmpty()) user = "root"; - if (!kapp->authorize("user/"+user)) + if (!tdeApp->authorize("user/"+user)) return false; } } @@ -345,31 +345,31 @@ bool KDesktopFile::tryExec() const * @return the filename as passed to the constructor. */ TQString -KDesktopFile::fileName() const { return backEnd->fileName(); } +TDEDesktopFile::fileName() const { return backEnd->fileName(); } /** * @return the resource type as passed to the constructor. */ TQString -KDesktopFile::resource() const { return backEnd->resource(); } +TDEDesktopFile::resource() const { return backEnd->resource(); } TQStringList -KDesktopFile::sortOrder() const +TDEDesktopFile::sortOrder() const { return readListEntry("SortOrder"); } -void KDesktopFile::virtual_hook( int id, void* data ) +void TDEDesktopFile::virtual_hook( int id, void* data ) { TDEConfig::virtual_hook( id, data ); } -TQString KDesktopFile::readDocPath() const +TQString TDEDesktopFile::readDocPath() const { return readPathEntry( "X-DocPath" ); } -KDesktopFile* KDesktopFile::copyTo(const TQString &file) const +TDEDesktopFile* TDEDesktopFile::copyTo(const TQString &file) const { - KDesktopFile *config = new KDesktopFile(TQString::null, false); + TDEDesktopFile *config = new TDEDesktopFile(TQString::null, false); TDEConfig::copyTo(file, config); config->setDesktopGroup(); return config; diff --git a/tdecore/kdesktopfile.h b/tdecore/tdedesktopfile.h index cfdc5488c..fbda9f9fd 100644 --- a/tdecore/kdesktopfile.h +++ b/tdecore/tdedesktopfile.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (c) 1999 Pietro Iglio <iglio@kde.org> This library is free software; you can redistribute it and/or @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KDESKTOPFILE_H -#define _KDESKTOPFILE_H +#ifndef _TDEDESKTOPFILE_H +#define _TDEDESKTOPFILE_H #include "tdeconfig.h" #include "tdelibs_export.h" -class KDesktopFilePrivate; +class TDEDesktopFilePrivate; /** * KDE Desktop File Management. @@ -31,13 +31,13 @@ class KDesktopFilePrivate; * @see TDEConfigBase TDEConfig * @short KDE Desktop File Management class */ -class TDECORE_EXPORT KDesktopFile : public TDEConfig +class TDECORE_EXPORT TDEDesktopFile : public TDEConfig { - Q_OBJECT + TQ_OBJECT public: /** - * Constructs a KDesktopFile object and make it either read-write + * Constructs a TDEDesktopFile object and make it either read-write * or read-only. * * @param fileName The name or path of the desktop file. If it @@ -48,15 +48,15 @@ public: * to search for if @p fileName is not absolute. For * instance, you might want to specify "config". */ - KDesktopFile( const TQString &fileName, bool readOnly = false, + TDEDesktopFile( const TQString &fileName, bool readOnly = false, const char * resType = "apps"); /** - * Destructs the KDesktopFile object. + * Destructs the TDEDesktopFile object. * * Writes back any dirty configuration entries. */ - virtual ~KDesktopFile(); + virtual ~TDEDesktopFile(); /** * Checks whether this is really a desktop file. @@ -214,15 +214,15 @@ public: /** * Copies all entries from this config object to a new - * KDesktopFile object that will save itself to @p file. + * TDEDesktopFile object that will save itself to @p file. * * Actual saving to @p file happens when the returned object is * destructed or when sync() is called upon it. * - * @param file the new KDesktopFile object it will save itself to. + * @param file the new TDEDesktopFile object it will save itself to. * @since 3.2 */ - KDesktopFile* copyTo(const TQString &file) const; + TDEDesktopFile* copyTo(const TQString &file) const; #ifdef KDE_NO_COMPAT private: @@ -230,20 +230,20 @@ private: /** * @deprecated Use fileName() instead. */ - KDE_DEPRECATED TQString filename() const { return fileName(); }; + TDE_DEPRECATED TQString filename() const { return fileName(); }; private: TQString translatedEntry(const char*) const; // copy-construction and assignment are not allowed - KDesktopFile( const KDesktopFile& ); - KDesktopFile& operator= ( const KDesktopFile& ); + TDEDesktopFile( const TDEDesktopFile& ); + TDEDesktopFile& operator= ( const TDEDesktopFile& ); protected: virtual void virtual_hook( int id, void* data ); private: - KDesktopFilePrivate *d; + TDEDesktopFilePrivate *d; }; diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp index 8ef5f59db..517debcad 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -38,8 +38,8 @@ #include <tdehardwaredevices.h> #include <tdenetworkconnections.h> #endif -#include <kstandarddirs.h> -#include <kinstance.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> #include "kstaticdeleter.h" #include <tqfont.h> @@ -139,7 +139,7 @@ void TDEGlobal::setActiveInstance(TDEInstance *i) } /** - * Create a static QString + * Create a static TQString * * To be used inside functions(!) like: * static const TQString &myString = TDEGlobal::staticQString("myText"); @@ -157,7 +157,7 @@ public: }; /** - * Create a static QString + * Create a static TQString * * To be used inside functions(!) like: * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); @@ -282,3 +282,20 @@ int kasciistricmp( const char *str1, const char *str2 ) return *s1 ? res : (*s2 ? -1 : 0); } +char* kasciitolower( char *s ) +{ + if ( !s ) + return 0; + for ( unsigned char *p = (unsigned char *) s; *p; ++p ) + *p = ( *p >= 'A' && *p <= 'Z' ) ? (*p - 'A' + 'a') : *p; + return s; +} + +char* kasciitoupper( char *s ) +{ + if ( !s ) + return 0; + for ( unsigned char *p = (unsigned char *) s; *p; ++p ) + *p = ( *p >= 'a' && *p <= 'z' ) ? (*p - 'a' + 'A') : *p; + return s; +} diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h index 1269c36a9..a8c16d3fb 100644 --- a/tdecore/tdeglobal.h +++ b/tdecore/tdeglobal.h @@ -19,7 +19,7 @@ #define _TDEGLOBAL_H #include "tdelibs_export.h" -#include <kinstance.h> // KDE4: class TDEInstance is enough here +#include <tdeinstance.h> // KDE4: class TDEInstance is enough here class KCharsets; class TDEConfig; @@ -234,7 +234,25 @@ inline const T& kClamp( const T& x, const T& low, const T& high ) * tqstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i' * @since 3.4 */ -int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 ); +TDECORE_EXPORT int kasciistricmp( const char *str1, const char *str2 ); + +/** + Locale-independent function to convert ASCII strings to lower case ASCII + strings. This means that it affects @em only the ASCII characters A-Z. + + @param str pointer to the string which should be converted to lower case + @return pointer to the converted string (same as @a str) +*/ +TDECORE_EXPORT char* kasciitolower( char *str ); + +/** + Locale-independent function to convert ASCII strings to upper case ASCII + strings. This means that it affects @em only the ASCII characters a-z. + + @param str pointer to the string which should be converted to upper case + @return pointer to the converted string (same as @a str) +*/ +TDECORE_EXPORT char* kasciitoupper( char *str ); /** diff --git a/tdecore/kglobalaccel.cpp b/tdecore/tdeglobalaccel.cpp index 746721e40..dd2a93b6f 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/tdeglobalaccel.cpp @@ -17,15 +17,15 @@ Boston, MA 02110-1301, USA. */ -#include "kglobalaccel.h" -#ifdef Q_WS_X11 -#include "kglobalaccel_x11.h" -#elif defined(Q_WS_WIN) -#include "kglobalaccel_win.h" -#elif defined(Q_WS_MACX) -#include "kglobalaccel_mac.h" +#include "tdeglobalaccel.h" +#ifdef TQ_WS_X11 +#include "tdeglobalaccel_x11.h" +#elif defined(TQ_WS_WIN) +#include "tdeglobalaccel_win.h" +#elif defined(TQ_WS_MACX) +#include "tdeglobalaccel_mac.h" #else -#include "kglobalaccel_emb.h" +#include "tdeglobalaccel_emb.h" #endif #include <tqstring.h> @@ -136,4 +136,4 @@ bool TDEGlobalAccel::useFourModifierKeys() void TDEGlobalAccel::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -#include "kglobalaccel.moc" +#include "tdeglobalaccel.moc" diff --git a/tdecore/kglobalaccel.h b/tdecore/tdeglobalaccel.h index a8ed8a955..be34a3cdd 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/tdeglobalaccel.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_H_ -#define _KGLOBALACCEL_H_ +#ifndef _TDEGLOBALACCEL_H_ +#define _TDEGLOBALACCEL_H_ #include <tqobject.h> #include <tdeshortcut.h> @@ -44,13 +44,13 @@ class TDEGlobalAccelPrivate; */ class TDECORE_EXPORT TDEGlobalAccel : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new TDEGlobalAccel object with the given pParent and * psName. - * @param pParent the parent of the QObject - * @param psName the name of the QObject + * @param pParent the parent of the TQObject + * @param psName the name of the TQObject */ TDEGlobalAccel( TQObject* pParent, const char* psName = 0 ); virtual ~TDEGlobalAccel(); @@ -76,7 +76,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQT_SLOT(slotDoSomething()) ); + * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. @@ -236,4 +236,4 @@ private: class TDEGlobalAccelPrivate* d; }; -#endif // _KGLOBALACCEL_H_ +#endif // _TDEGLOBALACCEL_H_ diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/tdeglobalaccel_emb.h index 5e5145d66..2fd16bd44 100644 --- a/tdecore/kglobalaccel_emb.h +++ b/tdecore/tdeglobalaccel_emb.h @@ -1,5 +1,5 @@ -#ifndef _KGLOBALACCEL_EMB_H -#define _KGLOBALACCEL_EMB_H +#ifndef _TDEGLOBALACCEL_EMB_H +#define _TDEGLOBALACCEL_EMB_H #include "tdeaccelbase.h" #include "tdeshortcut.h" @@ -15,4 +15,4 @@ public: virtual bool disconnectKey( TDEAccelAction&, KKeySequence ); }; -#endif // _KGLOBALACCEL_EMB_H +#endif // _TDEGLOBALACCEL_EMB_H diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/tdeglobalaccel_mac.h index b2803b0c0..c21533916 100644 --- a/tdecore/kglobalaccel_mac.h +++ b/tdecore/tdeglobalaccel_mac.h @@ -1,5 +1,5 @@ -#ifndef _KGLOBALACCEL_MAC_H -#define _KGLOBALACCEL_MAC_H +#ifndef _TDEGLOBALACCEL_MAC_H +#define _TDEGLOBALACCEL_MAC_H #include <tqwidget.h> @@ -28,4 +28,4 @@ public: { return false; } }; -#endif // _KGLOBALACCEL_EMB_H +#endif // _TDEGLOBALACCEL_MAC_H diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/tdeglobalaccel_win.cpp index 09c216b99..faf3708f4 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/tdeglobalaccel_win.cpp @@ -20,10 +20,10 @@ #include "config.h" #include <tqwindowdefs.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN -#include "kglobalaccel_win.h" -#include "kglobalaccel.h" +#include "tdeglobalaccel_win.h" +#include "tdeglobalaccel.h" #include "kkeyserver_x11.h" #include <tqpopupmenu.h> @@ -48,7 +48,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; -// kapp->installX11EventFilter( this ); +// tdeApp->installX11EventFilter( this ); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() @@ -161,7 +161,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE bool failed = false; if( bGrab ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 failed = handler.error( true ); // sync now #endif // If grab failed, then ungrab any grabs that could possibly succeed @@ -283,9 +283,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -340,6 +340,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) activate( pAction, KKeySequence() ); } -#include "kglobalaccel_win.moc" +#include "tdeglobalaccel_win.moc" -#endif // !Q_WS_WIN +#endif // !TQ_WS_WIN diff --git a/tdecore/kglobalaccel_win.h b/tdecore/tdeglobalaccel_win.h index e60fed8ee..ec224a0f7 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/tdeglobalaccel_win.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_WIN_H -#define _KGLOBALACCEL_WIN_H +#ifndef _TDEGLOBALACCEL_WIN_H +#define _TDEGLOBALACCEL_WIN_H #include <tqmap.h> #include <tqwidget.h> @@ -33,7 +33,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase { friend class TDEGlobalAccel; - Q_OBJECT + TQ_OBJECT public: TDEGlobalAccelPrivate(); virtual ~TDEGlobalAccelPrivate(); @@ -74,4 +74,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase bool m_blockingDisabled; }; -#endif // _KGLOBALACCEL_WIN_H +#endif // _TDEGLOBALACCEL_WIN_H diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/tdeglobalaccel_x11.cpp index 4ee2770ba..2bf6e0d3e 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/tdeglobalaccel_x11.cpp @@ -20,22 +20,22 @@ #include "config.h" #include <tqwindowdefs.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 -#include "kglobalaccel_x11.h" -#include "kglobalaccel.h" +#include "tdeglobalaccel_x11.h" +#include "tdeglobalaccel.h" #include "kkeyserver_x11.h" #include <tqpopupmenu.h> #include <tqregexp.h> #include <tqwidget.h> #include <tqmetaobject.h> -#include <tqucomextra_p.h> +#include <private/tqucomextra_p.h> #include <tdeapplication.h> #include <kdebug.h> #include <kkeynative.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <kxerrorhandler.h> #endif @@ -89,8 +89,8 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; - kapp->installX11EventFilter( this ); - connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); + tdeApp->installX11EventFilter( this ); + connect(tdeApp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int))); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() @@ -187,17 +187,14 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE return false; } -#ifndef __osf__ -// this crashes under Tru64 so ..... kdDebug(125) << TQString(TQString( "grabKey( key: '%1', bGrab: %2 ): keyCodeX: %3 keyModX: %4\n" ) .arg( key.key().toStringInternal() ).arg( bGrab ) .arg( keyCodeX, 0, 16 ).arg( keyModX, 0, 16 )); -#endif if( !keyCodeX ) { return false; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler( XGrabErrorHandler ); #endif // We'll have to grab 8 key modifier combinations in order to cover all @@ -227,7 +224,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE bool failed = false; if( bGrab ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 failed = handler.error( true ); // sync now #endif // If grab failed, then ungrab any grabs that could possibly succeed @@ -313,9 +310,9 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -392,9 +389,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -423,16 +420,16 @@ void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequenc int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[2]; - static_TQUType_int.set(o+1,n); + static_QUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { TQUObject o[4]; - static_TQUType_TQString.set(o+1,pAction->name()); - static_TQUType_TQString.set(o+2,pAction->label()); - static_TQUType_ptr.set(o+3,&seq); + static_QUType_TQString.set(o+1,pAction->name()); + static_QUType_TQString.set(o+2,pAction->label()); + static_QUType_ptr.set(o+3,&seq); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { @@ -449,6 +446,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) activate( pAction, KKeySequence() ); } -#include "kglobalaccel_x11.moc" +#include "tdeglobalaccel_x11.moc" -#endif // !Q_WS_X11 +#endif // !TQ_WS_X11 diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/tdeglobalaccel_x11.h index b22363926..2162299ee 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/tdeglobalaccel_x11.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_X11_H -#define _KGLOBALACCEL_X11_H +#ifndef _TDEGLOBALACCEL_X11_H +#define _TDEGLOBALACCEL_X11_H #include <tqmap.h> #include <tqwidget.h> @@ -33,7 +33,7 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase { friend class TDEGlobalAccel; - Q_OBJECT + TQ_OBJECT public: TDEGlobalAccelPrivate(); virtual ~TDEGlobalAccelPrivate(); @@ -107,4 +107,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase bool m_suspended; }; -#endif // _KGLOBALACCEL_X11_H +#endif // _TDEGLOBALACCEL_X11_H diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp index 79cd4586a..f03b4d9a5 100644 --- a/tdecore/tdeglobalsettings.cpp +++ b/tdecore/tdeglobalsettings.cpp @@ -24,16 +24,16 @@ #include <tqcursor.h> #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <kipc.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <windows.h> #include "qt_windows.h" #include <win32_utils.h> -static QRgb qt_colorref2qrgb(COLORREF col) +static TQRgb qt_colorref2qrgb(COLORREF col) { return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col)); } @@ -42,7 +42,7 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <kdebug.h> #include <tdeglobal.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcharsets.h> #include <tdeaccel.h> #include <tdelocale.h> @@ -54,7 +54,7 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <tqtextstream.h> #include <tqfile.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #endif @@ -315,7 +315,7 @@ TQColor TDEGlobalSettings::toolBarHighlightColor() TQColor TDEGlobalSettings::inactiveTitleColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)); #else if (!_inactiveBackground) @@ -327,7 +327,7 @@ TQColor TDEGlobalSettings::inactiveTitleColor() TQColor TDEGlobalSettings::inactiveTextColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); #else if (!_inactiveForeground) @@ -339,7 +339,7 @@ TQColor TDEGlobalSettings::inactiveTextColor() TQColor TDEGlobalSettings::activeTitleColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else initColors(); @@ -352,11 +352,11 @@ TQColor TDEGlobalSettings::activeTitleColor() TQColor TDEGlobalSettings::activeTextColor() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else TDEConfigGroup g( TDEGlobal::config(), "WM" ); - return g.readColorEntry( "activeForeground", tqwhiteptr ); + return g.readColorEntry( "activeForeground", &TQt::white ); #endif } @@ -377,7 +377,7 @@ TQColor TDEGlobalSettings::buttonBackground() TQColor TDEGlobalSettings::buttonTextColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "buttonForeground", tqblackptr ); + return g.readColorEntry( "buttonForeground", &TQt::black ); } // IMPORTANT: @@ -386,7 +386,7 @@ TQColor TDEGlobalSettings::buttonTextColor() TQColor TDEGlobalSettings::baseColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "windowBackground", tqwhiteptr ); + return g.readColorEntry( "windowBackground", &TQt::white ); } // IMPORTANT: @@ -395,7 +395,7 @@ TQColor TDEGlobalSettings::baseColor() TQColor TDEGlobalSettings::textColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "windowForeground", tqblackptr ); + return g.readColorEntry( "windowForeground", &TQt::black ); } // IMPORTANT: @@ -404,7 +404,7 @@ TQColor TDEGlobalSettings::textColor() TQColor TDEGlobalSettings::highlightedTextColor() { TDEConfigGroup g( TDEGlobal::config(), "General" ); - return g.readColorEntry( "selectForeground", tqwhiteptr ); + return g.readColorEntry( "selectForeground", &TQt::white ); } // IMPORTANT: @@ -429,7 +429,7 @@ TQColor TDEGlobalSettings::alternateBackgroundColor() TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) { - if (base == Qt::white) + if (base == TQt::white) return TQColor(238,246,255); else { @@ -437,7 +437,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base base.hsv( &h, &s, &v ); if (v > 128) return base.dark(106); - else if (base != Qt::black) + else if (base != TQt::black) return base.light(110); return TQColor(32,32,32); @@ -724,8 +724,8 @@ void TDEGlobalSettings::initPaths() } // Make sure this app gets the notifications about those paths - if (kapp) - kapp->addKipcEventMask(KIPC::SettingsChanged); + if (tdeApp) + tdeApp->addKipcEventMask(KIPC::SettingsChanged); } void TDEGlobalSettings::initColors() @@ -788,7 +788,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() s_mouseSettings = new KMouseSettings; KMouseSettings & s = *s_mouseSettings; // for convenience -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEConfigGroup g( TDEGlobal::config(), "Mouse" ); TQString setting = g.readEntry("MouseButtonMapping"); if (setting == "RightHanded") @@ -797,13 +797,13 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() s.handed = KMouseSettings::LeftHanded; else { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // get settings from X server // This is a simplified version of the code in input/mouse.cpp // Keep in sync ! s.handed = KMouseSettings::RightHanded; unsigned char map[20]; - int num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20); + int num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20); if( num_buttons == 2 ) { if ( (int)map[0] == 1 && (int)map[1] == 2 ) @@ -822,9 +822,9 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() // FIXME(E): Implement in Qt Embedded #endif } -#endif //Q_WS_WIN +#endif //TQ_WS_WIN } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //not cached s_mouseSettings->handed = (GetSystemMetrics(SM_SWAPBUTTON) ? KMouseSettings::LeftHanded : KMouseSettings::RightHanded); #endif @@ -833,7 +833,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() void TDEGlobalSettings::rereadMouseSettings() { -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN delete s_mouseSettings; s_mouseSettings = 0L; #endif @@ -841,7 +841,7 @@ void TDEGlobalSettings::rereadMouseSettings() bool TDEGlobalSettings::isMultiHead() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return GetSystemMetrics(SM_CMONITORS) > 1; #else TQCString multiHead = getenv("TDE_MULTIHEAD"); diff --git a/tdecore/tdeglobalsettings.h b/tdecore/tdeglobalsettings.h index 74b0d77a8..7a359b60e 100644 --- a/tdecore/tdeglobalsettings.h +++ b/tdecore/tdeglobalsettings.h @@ -238,7 +238,7 @@ class TDECORE_EXPORT TDEGlobalSettings * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents. */ static TQString trashPath() { initPaths(); return *s_trashPath; } - // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs + // KDE4: if you want to remove the above, move it to kdesktop/init.cpp, which needs // to know the old location of the trash /** diff --git a/tdecore/tdehw/CMakeLists.txt b/tdecore/tdehw/CMakeLists.txt index 737d0557c..1951b0d16 100644 --- a/tdecore/tdehw/CMakeLists.txt +++ b/tdecore/tdehw/CMakeLists.txt @@ -17,7 +17,7 @@ if( NOT DBUS_SYSTEM_BUS ) set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) endif() -if( WITH_TDEHWLIB_DAEMONS OR WITH_HAL OR WITH_DEVKITPOWER OR WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR +if( WITH_TDEHWLIB_DAEMONS OR WITH_DEVKITPOWER OR WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT ) list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} ) list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} ) @@ -28,10 +28,6 @@ if( WITH_TDEHWLIB_DAEMONS ) add_definitions( -DWITH_TDEHWLIB_DAEMONS ) endif( ) -if( WITH_HAL ) - add_definitions( -DWITH_HAL ) -endif( ) - if( WITH_DEVKITPOWER ) add_definitions( -DWITH_DEVKITPOWER ) endif( ) @@ -124,7 +120,9 @@ set( ${target}_SRCS disksHelper.cpp ) -tde_add_library( ${target} STATIC_PIC AUTOMOC +tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} - LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES} + VERSION 14.1.0 + LINK_PRIVATE udev tdecore-shared ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdecore/tdehw/disksHelper.cpp b/tdecore/tdehw/disksHelper.cpp index 2589e5053..c47bc5e04 100644 --- a/tdecore/tdehw/disksHelper.cpp +++ b/tdecore/tdehw/disksHelper.cpp @@ -17,10 +17,6 @@ Boston, MA 02110-1301, USA. */ -#include "disksHelper.h" -#include "tdelocale.h" -#include "tdestoragedevice.h" - #if defined(WITH_UDISKS) || defined(WITH_UDISKS2) #include <tqdbusdata.h> #include <tqdbusmessage.h> @@ -31,6 +27,11 @@ #include <tqdbusdatamap.h> #include <tqdbusobjectpath.h> #include "tqdbusdatalist.h" + #include "tqstring.h" + + #include "tdelocale.h" + #include "tdestoragedevice.h" + #include "disksHelper.h" #endif @@ -38,7 +39,7 @@ //------------------------------- // UDisks //------------------------------- -TQStringVariantMap UDisksEjectDrive(TDEStorageDevice *sdevice) { +TQStringVariantMap udisksEjectDrive(TDEStorageDevice *sdevice) { TQStringVariantMap result; result["result"] = false; @@ -63,15 +64,48 @@ TQStringVariantMap UDisksEjectDrive(TDEStorageDevice *sdevice) { return result; } else { - result["result"] = true; - return result; + // Eject was successful. Check if the media can be powered off and do so in case + TQT_DBusProxy driveInformation("org.freedesktop.UDisks", blockDeviceString, + "org.freedesktop.DBus.Properties", dbusConn); + params.clear(); + params << TQT_DBusData::fromString("org.freedesktop.UDisks.Drive") << TQT_DBusData::fromString("DriveCanDetach"); + TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error); + if (error.isValid()) { + // Error! + result["errStr"] = error.name() + ": " + error.message(); + return result; + } + + if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { + bool canPowerOff = reply[0].toVariant().value.toBool(); + if (!canPowerOff) { + // This drive does not support power off. Just return since the eject operation has finished. + result["result"] = true; + return result; + } + + // Power off the drive! + params.clear(); + TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant); + params << TQT_DBusData::fromStringKeyMap(options); + TQT_DBusMessage reply = driveControl.sendWithReply("DriveDetach", params, &error); + if (error.isValid()) { + // Error! + result["errStr"] = error.name() + ": " + error.message(); + return result; + } + else { + result["result"] = true; + return result; + } + } } } } return result; } -TQStringVariantMap UDisksMountDrive(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions) { +TQStringVariantMap udisksMountDrive(const TQString &deviceNode, const TQString &fileSystemType, TQStringList mountOptions) { TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -113,7 +147,7 @@ TQStringVariantMap UDisksMountDrive(TQString deviceNode, TQString fileSystemType return result; } -TQStringVariantMap UDisksUnmountDrive(TQString deviceNode, TQStringList unmountOptions) { +TQStringVariantMap udisksUnmountDrive(const TQString &deviceNode, TQStringList unmountOptions) { TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -160,7 +194,7 @@ TQStringVariantMap UDisksUnmountDrive(TQString deviceNode, TQStringList unmountO //------------------------------- // UDisks2 //------------------------------- -TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { +TQStringVariantMap udisks2EjectDrive(TDEStorageDevice *sdevice) { TQStringVariantMap result; result["result"] = false; @@ -192,7 +226,7 @@ TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { TQT_DBusProxy driveInformation("org.freedesktop.UDisks2", driveObjectPath, "org.freedesktop.DBus.Properties", dbusConn); // can eject? - TQValueList<TQT_DBusData> params; + params.clear(); params << TQT_DBusData::fromString("org.freedesktop.UDisks2.Drive") << TQT_DBusData::fromString("Ejectable"); TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error); if (error.isValid()) { @@ -210,7 +244,7 @@ TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { // Eject the drive! TQT_DBusProxy driveControl("org.freedesktop.UDisks2", driveObjectPath, "org.freedesktop.UDisks2.Drive", dbusConn); - TQValueList<TQT_DBusData> params; + params.clear(); TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant); params << TQT_DBusData::fromStringKeyMap(options); TQT_DBusMessage reply = driveControl.sendWithReply("Eject", params, &error); @@ -220,8 +254,39 @@ TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { return result; } else { - result["result"] = true; - return result; + // Eject was successful. Check if the media can be powered off and do so in case + params.clear(); + params << TQT_DBusData::fromString("org.freedesktop.UDisks2.Drive") << TQT_DBusData::fromString("CanPowerOff"); + TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error); + if (error.isValid()) { + // Error! + result["errStr"] = error.name() + ": " + error.message(); + return result; + } + + if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { + bool canPowerOff = reply[0].toVariant().value.toBool(); + if (!canPowerOff) { + // This drive does not support power off. Just return since the eject operation has finished. + result["result"] = true; + return result; + } + + // Power off the drive! + params.clear(); + TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant); + params << TQT_DBusData::fromStringKeyMap(options); + TQT_DBusMessage reply = driveControl.sendWithReply("PowerOff", params, &error); + if (error.isValid()) { + // Error! + result["errStr"] = error.name() + ": " + error.message(); + return result; + } + else { + result["result"] = true; + return result; + } + } } } } @@ -230,7 +295,7 @@ TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { return result; } -TQStringVariantMap UDisks2MountDrive(TQString deviceNode, TQString fileSystemType, TQString mountOptions) { +TQStringVariantMap udisks2MountDrive(const TQString &deviceNode, const TQString &fileSystemType, const TQString &mountOptions) { TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -276,7 +341,7 @@ TQStringVariantMap UDisks2MountDrive(TQString deviceNode, TQString fileSystemTyp return result; } -TQStringVariantMap UDisks2UnmountDrive(TQString deviceNode, TQString unmountOptions) { +TQStringVariantMap udisks2UnmountDrive(const TQString &deviceNode, const TQString &unmountOptions) { TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -318,4 +383,98 @@ TQStringVariantMap UDisks2UnmountDrive(TQString deviceNode, TQString unmountOpti } return result; } + +TQStringVariantMap udisks2UnlockDrive(const TQString &deviceNode, const TQString &passphrase) { + TQStringVariantMap result; + result["result"] = false; + result["retcode"] = -2; + + TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); + if (dbusConn.isConnected()) { + TQString blockDeviceString = deviceNode; + blockDeviceString.replace("/dev/", ""); + blockDeviceString.replace("-", "_2d"); + blockDeviceString = "/org/freedesktop/UDisks2/block_devices/" + blockDeviceString; + + // Unlock/decrypt the drive! + TQT_DBusError error; + TQT_DBusProxy driveControl("org.freedesktop.UDisks2", blockDeviceString, "org.freedesktop.UDisks2.Encrypted", dbusConn); + if (driveControl.canSend()) { + TQValueList<TQT_DBusData> params; + params << TQT_DBusData::fromString(passphrase); + TQMap<TQString, TQT_DBusVariant> optionsMap; + params << TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(optionsMap)); + TQT_DBusMessage reply = driveControl.sendWithReply("Unlock", params, &error); + if (!error.isValid()) { + if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { + TQT_DBusObjectPath deviceObjectPath = reply[0].toObjectPath(); + if (deviceObjectPath.isValid()) { + // Success + result["unlockedDevice"] = deviceObjectPath; + result["retcode"] = 0; + result["result"] = true; + return result; + } + } + result["errStr"] = i18n("Unknown error during unlocking operation."); + result["retcode"] = -1; + return result; + } + else { + // Error! + if (error.name() == "org.freedesktop.DBus.Error.ServiceUnknown") { + return result; // Service not installed or unavailable + } + else { + result["errStr"] = error.name() + ": " + error.message(); + result["retcode"] = -1; + return result; + } + } + } + } + return result; +} + +TQStringVariantMap udisks2LockDrive(const TQString &deviceNode) { + TQStringVariantMap result; + result["result"] = false; + result["retcode"] = -2; + + TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); + if (dbusConn.isConnected()) { + TQString blockDeviceString = deviceNode; + blockDeviceString.replace("/dev/", ""); + blockDeviceString.replace("-", "_2d"); + blockDeviceString = "/org/freedesktop/UDisks2/block_devices/" + blockDeviceString; + + // Lock/encrypt the drive! + TQT_DBusError error; + TQT_DBusProxy driveControl("org.freedesktop.UDisks2", blockDeviceString, "org.freedesktop.UDisks2.Encrypted", dbusConn); + if (driveControl.canSend()) { + TQValueList<TQT_DBusData> params; + TQMap<TQString, TQT_DBusVariant> optionsMap; + params << TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(optionsMap)); + TQT_DBusMessage reply = driveControl.sendWithReply("Lock", params, &error); + if (!error.isValid()) { + // Success + result["retcode"] = 0; + result["result"] = true; + return result; + } + else { + // Error! + if (error.name() == "org.freedesktop.DBus.Error.ServiceUnknown") { + return result; // Service not installed or unavailable + } + else { + result["errStr"] = error.name() + ": " + error.message(); + result["retcode"] = -1; + return result; + } + } + } + } + return result; +} #endif diff --git a/tdecore/tdehw/disksHelper.h b/tdecore/tdehw/disksHelper.h index 665de8223..560d3cd9a 100644 --- a/tdecore/tdehw/disksHelper.h +++ b/tdecore/tdehw/disksHelper.h @@ -20,22 +20,32 @@ #ifndef _DISKS_HELPER_H #define _DISKS_HELPER_H -#include <stdlib.h> -#include "tdestoragedevice.h" +#if defined(WITH_UDISKS) || defined(WITH_UDISKS2) + #include "tqstringlist.h" + #include "tqvariant.h" + class TQString; + class TDEStorageDevice; +#endif +#ifdef WITH_UDISKS //------------------------------- // UDisks //------------------------------- -TQStringVariantMap UDisksEjectDrive(TDEStorageDevice *sdevice); -TQStringVariantMap UDisksMountDrive(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions); -TQStringVariantMap UDisksUnmountDrive(TQString deviceNode, TQStringList unmountOptions); +TQStringVariantMap udisksEjectDrive(TDEStorageDevice *sdevice); +TQStringVariantMap udisksMountDrive(const TQString &deviceNode, const TQString &fileSystemType, TQStringList mountOptions); +TQStringVariantMap udisksUnmountDrive(const TQString &deviceNode, TQStringList unmountOptions); +#endif +#ifdef WITH_UDISKS2 //------------------------------- // UDisks2 //------------------------------- -TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice); -TQStringVariantMap UDisks2MountDrive(TQString deviceNode, TQString fileSystemType, TQString mountOptions); -TQStringVariantMap UDisks2UnmountDrive(TQString deviceNode, TQString unmountOptions); +TQStringVariantMap udisks2EjectDrive(TDEStorageDevice *sdevice); +TQStringVariantMap udisks2MountDrive(const TQString &deviceNode, const TQString &fileSystemType, const TQString &mountOptions); +TQStringVariantMap udisks2UnmountDrive(const TQString &deviceNode, const TQString &unmountOptions); +TQStringVariantMap udisks2UnlockDrive(const TQString &deviceNode, const TQString &passphrase); +TQStringVariantMap udisks2LockDrive(const TQString &deviceNode); +#endif #endif diff --git a/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf index c50a5144d..e3c4b549d 100644 --- a/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf +++ b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf @@ -16,14 +16,6 @@ <allow send_destination="org.trinitydesktop.hardwarecontrol" send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.Brightness" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.CPUGovernor" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.InputEvents" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.Power" - send_interface="org.freedesktop.DBus.Properties"/> <allow send_destination="org.trinitydesktop.hardwarecontrol" send_interface="org.trinitydesktop.hardwarecontrol"/> @@ -44,14 +36,6 @@ <allow send_destination="org.trinitydesktop.hardwarecontrol" send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.Brightness" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.CPUGovernor" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.InputEvents" - send_interface="org.freedesktop.DBus.Properties"/> - <allow send_destination="org.trinitydesktop.hardwarecontrol.Power" - send_interface="org.freedesktop.DBus.Properties"/> <allow send_destination="org.trinitydesktop.hardwarecontrol" send_interface="org.trinitydesktop.hardwarecontrol"/> @@ -70,5 +54,9 @@ <deny own="org.trinitydesktop.hardwarecontrol"/> <deny send_destination="org.trinitydesktop.hardwarecontrol"/> + + <!-- Allow to read input switches --> + <allow send_destination="org.trinitydesktop.hardwarecontrol" + send_interface="org.trinitydesktop.hardwarecontrol.InputEvents"/> </policy> </busconfig> diff --git a/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids index bf4a3ce01..274e042f9 100644 --- a/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids +++ b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids @@ -1,6 +1,6 @@ # The information provided in this PNP ID to friendly name mapping table was obtained from # multiple public sources, as well as this authoritative publicly accessible file: -# ftp://ftpmicrosoftcom/developr/drg/plug-and-play/devidstxt +# https://stuff.mit.edu/afs/sipb/contrib/doc/specs/protocol/pnp/devids.txt # # This file is provided soley in the interest of cross platform compatibility # It only contains information on certain generic core system devices that cannot be looked up via another method @@ -17,140 +17,332 @@ # # The two digit code yy appears to be a PCI device type code followed by a subtype code and should be parsed as such -PNP0802 Microsoft® Sound System-compatible device - -PNP0000 AT Interrupt Controller -PNP0001 EISA Interrupt Controller -PNP0002 MCA Interrupt Controller -PNP0003 APIC -PNP0004 Cyrix SLiC MP Interrupt Controller - -PNP0100 AT Timer -PNP0101 EISA Timer -PNP0102 MCA Timer -PNP0103 High Precision Event Timer - -PNP0200 AT DMA Controller -PNP0201 EISA DMA Controller -PNP0202 MCA DMA Controller - -PNP0300 IBM PC/XT keyboard controller (83-key) -PNP0301 IBM PC/AT keyboard controller (86-key) -PNP0302 IBM PC/XT keyboard controller (84-key) -PNP0303 IBM Enhanced (101/102-key, PS/2 mouse support) -PNP0304 Olivetti Keyboard (83-key) -PNP0305 Olivetti Keyboard (102-key) -PNP0306 Olivetti Keyboard (86-key) -PNP0307 Microsoft® Windows(R) Keyboard -PNP0308 General Input Device Emulation Interface (GIDEI) legacy -PNP0309 Olivetti Keyboard (A101/102 key) -PNP030A AT&T 302 keyboard -PNP030B Reserved by Microsoft® -PNP0320 Japanese 106-key keyboard A01 -PNP0321 Japanese 101-key keyboard -PNP0322 Japanese AX keyboard -PNP0323 Japanese 106-key keyboard 002/003 -PNP0324 Japanese 106-key keyboard 001 -PNP0325 Japanese Toshiba Desktop keyboard -PNP0326 Japanese Toshiba Laptop keyboard -PNP0327 Japanese Toshiba Notebook keyboard -PNP0340 Korean 84-key keyboard -PNP0341 Korean 86-key keyboard -PNP0342 Korean Enhanced keyboard -PNP0343 Korean Enhanced keyboard 101b -PNP0343 Korean Enhanced keyboard 101c -PNP0344 Korean Enhanced keyboard 103 - -PNP0400 Standard LPT Printer Port -PNP0401 ECP Printer Port - -PNP0500 Standard PC Serial Port -PNP0501 16550A-compatible Serial Port -PNP0502 Multiport Serial Device (non-intelligent 16550) -PNP0510 Generic IRDA-compatible Device -PNP0511 Generic IRDA-compatible Device - -PNP0600 Generic ESDI/IDE/ATA Compatible Hard Disk Controller -PNP0603 Generic IDE supporting Microsoft® Device Bay Specification -PNP0700 PC Standard Floppy Disk Controller -PNP0701 Microsoft® Device Bay Compatible Floppy Controller - -PNP0802 Microsoft® Sound System compatible device - -PNP0900 VGA Compatible Display Controller -PNP09FF Plug and Play Monitor (VESA DDC) - -PNP0A00 ISA Root Bus -PNP0A01 EISA Root Bus -PNP0A02 MCA Root Bus -PNP0A03 PCI Root Bus -PNP0A04 VESA/VL Bus -PNP0A05 Generic ACPI Root Bus -PNP0A06 Generic ACPI Extended-IO Root Bus (EIO Root Bus) -PNP0A08 PCI Express Root Bus - -PNP0800 AT-style Speaker -PNP0B00 AT Real-Time Clock -PNP0C00 Plug and Play BIOS -PNP0C01 System Board -PNP0C02 Plug and Play Motherboard Register Resource -PNP0C03 Plug and Play BIOS Event Notification Interrupt -PNP0C04 Math Coprocessor -PNP0C05 APM BIOS -PNP0C06 Early Plug and Play BIOS -PNP0C07 Early Plug and Play BIOS -PNP0C08 ACPI System Board -PNP0C09 ACPI Embedded Controller -PNP0C0A ACPI Control Method Battery -PNP0C0B ACPI Fan -PNP0C0C ACPI Power Button -PNP0C0D ACPI Lid Switch -PNP0C0E ACPI Sleep Button -PNP0C0F PCI Interrupt Link -PNP0C10 ACPI System Indicator -PNP0C11 ACPI Thermal Zone -PNP0C12 Device Bay Controller -PNP0C13 Plug and Play BIOS - -PNP0E00 Intel 82365-Compatible PCMCIA Controller -PNP0E01 Cirrus Logic CL-PD6720 PCMCIA Controller -PNP0E02 VLSI VL82C146 PCMCIA Controller -PNP0E03 Intel 82365-compatible CardBus controller - -PNP0F00 Microsoft® Bus Mouse -PNP0F01 Microsoft® Serial Mouse -PNP0F02 Microsoft® InPort Mouse -PNP0F03 Microsoft® PS/2-style Mouse -PNP0F04 Mouse Systems Mouse -PNP0F05 Mouse Systems 3-Button Mouse -PNP0F06 Genius Mouse -PNP0F07 Genius Mouse -PNP0F08 Logitech Serial Mouse -PNP0F09 Microsoft® BallPoint Serial Mouse -PNP0F0A Microsoft® Plug and Play Mouse -PNP0F0B Microsoft® Plug and Play BallPoint Mouse -PNP0F0C Microsoft®-compatible Serial Mouse -PNP0F0D Microsoft®-compatible InPort-compatible Mouse -PNP0F0E Microsoft®-compatible PS/2-style Mouse -PNP0F0F Microsoft®-compatible Serial BallPoint-compatible Mouse -PNP0F10 Texas Instruments QuickPort Mouse -PNP0F11 Microsoft®-compatible Bus Mouse -PNP0F12 Logitech PS/2-style Mouse -PNP0F13 PS/2 Port for PS/2-style Mice -PNP0F14 Microsoft® Kids Mouse -PNP0F15 Logitech bus mouse -PNP0F16 Logitech SWIFT device -PNP0F17 Logitech-compatible serial mouse -PNP0F18 Logitech-compatible bus mouse -PNP0F19 Logitech-compatible PS/2-style Mouse -PNP0F1A Logitech-compatible SWIFT Device -PNP0F1B HP Omnibook Mouse -PNP0F1C Compaq LTE Trackball PS/2-style Mouse -PNP0F1D Compaq LTE Trackball Serial Mouse -PNP0F1E Microsoft® Kids Trackball Mouse -PNP0F1F Reserved by Microsoft® Input Device Group -PNP0F20 Reserved by Microsoft® Input Device Group -PNP0F21 Reserved by Microsoft® Input Device Group -PNP0F22 Reserved by Microsoft® Input Device Group -PNP0F23 Reserved by Microsoft® Input Device Group -PNP0FFF Reserved by Microsoft® Systems
\ No newline at end of file +PNP0000 AT Interrupt Controller +PNP0001 EISA Interrupt Controller +PNP0002 MCA Interrupt Controller +PNP0003 APIC +PNP0004 Cyrix SLiC MP interrupt controller + +PNP0100 AT Timer +PNP0101 EISA Timer +PNP0102 MCA Timer + +PNP0200 AT DMA Controller +PNP0201 EISA DMA Controller +PNP0202 MCA DMA Controller + +PNP0300 IBM PC/XT keyboard controller (83-key) +PNP0301 IBM PC/AT keyboard controller (86-key) +PNP0302 IBM PC/XT keyboard controller (84-key) +PNP0303 IBM Enhanced (101/102-key, PS/2 mouse support) +PNP0304 Olivetti Keyboard (83-key) +PNP0305 Olivetti Keyboard (102-key) +PNP0306 Olivetti Keyboard (86-key) +PNP0307 Microsoft Windows(R) Keyboard +PNP0308 General Input Device Emulation Interface (GIDEI) legacy +PNP0309 Olivetti Keyboard (A101/102 key) +PNP030A AT&T 302 keyboard +PNP030B Reserved by Microsoft +PNP0320 Japanese 106-key keyboard A01 +PNP0321 Japanese 101-key keyboard +PNP0322 Japanese AX keyboard +PNP0323 Japanese 106-key keyboard 002/003 +PNP0324 Japanese 106-key keyboard 001 +PNP0325 Japanese Toshiba Desktop keyboard +PNP0326 Japanese Toshiba Laptop keyboard +PNP0327 Japanese Toshiba Notebook keyboard +PNP0340 Korean 84-key keyboard +PNP0341 Korean 86-key keyboard +PNP0342 Korean Enhanced keyboard +PNP0343 Korean Enhanced keyboard 101b +PNP0343 Korean Enhanced keyboard 101c +PNP0344 Korean Enhanced keyboard 103 + +PNP0400 Standard LPT printer port +PNP0401 ECP printer port + +PNP0500 Standard PC COM port +PNP0501 16550A-compatible COM port +PNP0502 Multiport serial device (non-intelligent 16550) +PNP0510 Generic IRDA-compatible device +PNP0511 Generic IRDA-compatible device + +PNP0600 Generic ESDI/IDE/ATA compatible hard disk controller +PNP0601 Plus Hardcard II +PNP0602 Plus Hardcard IIXL/EZ +PNP0603 Generic IDE supporting Microsoft Device Bay Specification +PNP0700 PC standard floppy disk controller +PNP0701 Standard floppy controller supporting MS Device Bay Spec + +PNP0802 Microsoft Sound System compatible device (obsolete, use PNPB0xx instead) +PNP0900 VGA Compatible +PNP0901 Video Seven VRAM/VRAM II/1024i +PNP0902 8514/A Compatible +PNP0903 Trident VGA +PNP0904 Cirrus Logic Laptop VGA +PNP0905 Cirrus Logic VGA +PNP0906 Tseng ET4000 +PNP0907 Western Digital VGA +PNP0908 Western Digital Laptop VGA +PNP0909 S3 Inc. 911/924 +PNP090A ATI Ultra Pro/Plus (Mach 32) +PNP090B ATI Ultra (Mach 8) +PNP090C XGA Compatible +PNP090D ATI VGA Wonder +PNP090E Weitek P9000 Graphics Adapter +PNP090F Oak Technology VGA +PNP0910 Compaq QVision +PNP0911 XGA/2 +PNP0912 Tseng Labs W32/W32i/W32p +PNP0913 S3 Inc. 801/928/964 +PNP0914 Cirrus Logic 5429/5434 (memory mapped) +PNP0915 Compaq Advanced VGA (AVGA) +PNP0916 ATI Ultra Pro Turbo (Mach64) +PNP0917 Reserved by Microsoft +PNP0918 Matrox MGA +PNP0919 Compaq QVision 2000 +PNP091A Tseng W128 +PNP0930 Chips & Technologies Super VGA +PNP0931 Chips & Technologies Accelerator +PNP0940 NCR 77c22e Super VGA +PNP0941 NCR 77c32blt +PNP09FF Plug and Play Monitors (VESA DDC) + +PNP0A00 ISA Bus +PNP0A01 EISA Bus +PNP0A02 MCA Bus +PNP0A03 PCI Bus +PNP0A04 VESA/VL Bus +PNP0A05 Generic ACPI Bus +PNP0A06 Generic ACPI Extended-IO Bus (EIO bus) + +PNP0800 AT-style speaker sound +PNP0B00 AT Real-Time Clock +PNP0C00 Plug and Play BIOS (only created by the root enumerator) +PNP0C01 System Board +PNP0C02 General ID for reserving resources required by Plug and Play motherboard registers. (Not specific to a particular device.) +PNP0C03 Plug and Play BIOS Event Notification Interrupt +PNP0C04 Math Coprocessor +PNP0C05 APM BIOS (Version independent) +PNP0C06 Reserved for identification of early Plug and Play BIOS implementation. +PNP0C07 Reserved for identification of early Plug and Play BIOS implementation. +PNP0C08 ACPI system board hardware +PNP0C09 ACPI Embedded Controller +PNP0C0A ACPI Control Method Battery +PNP0C0B ACPI Fan +PNP0C0C ACPI power button device +PNP0C0D ACPI lid device +PNP0C0E ACPI sleep button device +PNP0C0F PCI interrupt link device +PNP0C10 ACPI system indicator device +PNP0C11 ACPI thermal zone +PNP0C12 Device Bay Controller +PNP0C13 Plug and Play BIOS (used when ACPI mode cannot be used) + +PNP0E00 Intel 82365-Compatible PCMCIA Controller +PNP0E01 Cirrus Logic CL-PD6720 PCMCIA Controller +PNP0E02 VLSI VL82C146 PCMCIA Controller +PNP0E03 Intel 82365-compatible CardBus controller + +PNP0F00 Microsoft Bus Mouse +PNP0F01 Microsoft Serial Mouse +PNP0F02 Microsoft InPort Mouse +PNP0F03 Microsoft PS/2-style Mouse +PNP0F04 Mouse Systems Mouse +PNP0F05 Mouse Systems 3-Button Mouse (COM2) +PNP0F06 Genius Mouse (COM1) +PNP0F07 Genius Mouse (COM2) +PNP0F08 Logitech Serial Mouse +PNP0F09 Microsoft BallPoint Serial Mouse +PNP0F0A Microsoft Plug and Play Mouse +PNP0F0B Microsoft Plug and Play BallPoint Mouse +PNP0F0C Microsoft-compatible Serial Mouse +PNP0F0D Microsoft-compatible InPort-compatible Mouse +PNP0F0E Microsoft-compatible PS/2-style Mouse +PNP0F0F Microsoft-compatible Serial BallPoint-compatible Mouse +PNP0F10 Texas Instruments QuickPort Mouse +PNP0F11 Microsoft-compatible Bus Mouse +PNP0F12 Logitech PS/2-style Mouse +PNP0F13 PS/2 Port for PS/2-style Mice +PNP0F14 Microsoft Kids Mouse +PNP0F15 Logitech bus mouse +PNP0F16 Logitech SWIFT device +PNP0F17 Logitech-compatible serial mouse +PNP0F18 Logitech-compatible bus mouse +PNP0F19 Logitech-compatible PS/2-style Mouse +PNP0F1A Logitech-compatible SWIFT Device +PNP0F1B HP Omnibook Mouse +PNP0F1C Compaq LTE Trackball PS/2-style Mouse +PNP0F1D Compaq LTE Trackball Serial Mouse +PNP0F1E Microsoft Kids Trackball Mouse +PNP0F1F Reserved by Microsoft Input Device Group +PNP0F20 Reserved by Microsoft Input Device Group +PNP0F21 Reserved by Microsoft Input Device Group +PNP0F22 Reserved by Microsoft Input Device Group +PNP0F23 Reserved by Microsoft Input Device Group +PNP0FFF Reserved by Microsoft Systems + +PNP8001 Novell/Anthem NE3200 +PNP8004 Compaq NE3200 +PNP8006 Intel EtherExpress/32 +PNP8008 HP EtherTwist EISA LAN Adapter/32 (HP27248A) +PNP8065 Ungermann-Bass NIUps or NIUps/EOTP +PNP8072 DEC (DE211) EtherWorks MC/TP +PNP8073 DEC (DE212) EtherWorks MC/TP_BNC +PNP8078 DCA 10 Mb MCA +PNP8074 HP MC LAN Adapter/16 TP (PC27246) +PNP80c9 IBM Token Ring +PNP80ca IBM Token Ring II +PNP80cb IBM Token Ring II/Short +PNP80cc IBM Token Ring 4/16Mbs +PNP80d3 Novell/Anthem NE1000 +PNP80d4 Novell/Anthem NE2000 +PNP80d5 NE1000 Compatible +PNP80d6 NE2000 Compatible +PNP80d7 Novell/Anthem NE1500T +PNP80d8 Novell/Anthem NE2100 +PNP80dd SMC ARCNETPC +PNP80de SMC ARCNET PC100, PC200 +PNP80df SMC ARCNET PC110, PC210, PC250 +PNP80e0 SMC ARCNET PC130/E +PNP80e1 SMC ARCNET PC120, PC220, PC260 +PNP80e2 SMC ARCNET PC270/E +PNP80e5 SMC ARCNET PC600W, PC650W +PNP80e7 DEC DEPCA +PNP80e8 DEC (DE100) EtherWorks LC +PNP80e9 DEC (DE200) EtherWorks Turbo +PNP80ea DEC (DE101) EtherWorks LC/TP +PNP80eb DEC (DE201) EtherWorks Turbo/TP +PNP80ec DEC (DE202) EtherWorks Turbo/TP_BNC +PNP80ed DEC (DE102) EtherWorks LC/TP_BNC +PNP80ee DEC EE101 (Built-In) +PNP80ef DECpc 433 WS (Built-In) +PNP80f1 3Com EtherLink Plus +PNP80f3 3Com EtherLink II or IITP (8 or 16-bit) +PNP80f4 3Com TokenLink +PNP80f6 3Com EtherLink 16 +PNP80f7 3Com EtherLink III +PNP80f8 3Com Generic Etherlink Plug and Play Device +PNP80fb Thomas Conrad TC6045 +PNP80fc Thomas Conrad TC6042 +PNP80fd Thomas Conrad TC6142 +PNP80fe Thomas Conrad TC6145 +PNP80ff Thomas Conrad TC6242 +PNP8100 Thomas Conrad TC6245 +PNP8105 DCA 10 MB +PNP8106 DCA 10 MB Fiber Optic +PNP8107 DCA 10 MB Twisted Pair +PNP8113 Racal NI6510 +PNP811C Ungermann-Bass NIUpc +PNP8120 Ungermann-Bass NIUpc/EOTP +PNP8123 SMC StarCard PLUS (WD/8003S) +PNP8124 SMC StarCard PLUS With On Board Hub (WD/8003SH) +PNP8125 SMC EtherCard PLUS (WD/8003E) +PNP8126 SMC EtherCard PLUS With Boot ROM Socket (WD/8003EBT) +PNP8127 SMC EtherCard PLUS With Boot ROM Socket (WD/8003EB) +PNP8128 SMC EtherCard PLUS TP (WD/8003WT) +PNP812a SMC EtherCard PLUS 16 With Boot ROM Socket (WD/8013EBT) +PNP812d Intel EtherExpress 16 or 16TP +PNP812f Intel TokenExpress 16/4 +PNP8130 Intel TokenExpress MCA 16/4 +PNP8132 Intel EtherExpress 16 (MCA) +PNP8137 Artisoft AE-1 +PNP8138 Artisoft AE-2 or AE-3 +PNP8141 Amplicard AC 210/XT +PNP8142 Amplicard AC 210/AT +PNP814b Everex SpeedLink /PC16 (EV2027) +PNP8155 HP PC LAN Adapter/8 TP (HP27245) +PNP8156 HP PC LAN Adapter/16 TP (HP27247A) +PNP8157 HP PC LAN Adapter/8 TL (HP27250) +PNP8158 HP PC LAN Adapter/16 TP Plus (HP27247B) +PNP8159 HP PC LAN Adapter/16 TL Plus (HP27252) +PNP815f National Semiconductor Ethernode *16AT +PNP8160 National Semiconductor AT/LANTIC EtherNODE 16-AT3 +PNP816a NCR Token-Ring 4 Mbs ISA +PNP816d NCR Token-Ring 16/4 Mbs ISA +PNP8191 Olicom 16/4 Token-Ring Adapter +PNP81c3 SMC EtherCard PLUS Elite (WD/8003EP) +PNP81c4 SMC EtherCard PLUS 10T (WD/8003W) +PNP81c5 SMC EtherCard PLUS Elite 16 (WD/8013EP) +PNP81c6 SMC EtherCard PLUS Elite 16T (WD/8013W) +PNP81c7 SMC EtherCard PLUS Elite 16 Combo (WD/8013EW or 8013EWC) +PNP81c8 SMC EtherElite Ultra 16 +PNP81e4 Pure Data PDI9025-32 (Token Ring) +PNP81e6 Pure Data PDI508+ (ArcNet) +PNP81e7 Pure Data PDI516+ (ArcNet) +PNP81eb Proteon Token Ring (P1390) +PNP81ec Proteon Token Ring (P1392) +PNP81ed Proteon ISA Token Ring (1340) +PNP81ee Proteon ISA Token Ring (1342) +PNP81ef Proteon ISA Token Ring (1346) +PNP81f0 Proteon ISA Token Ring (1347) +PNP81ff Cabletron E2000 Series DNI +PNP8200 Cabletron E2100 Series DNI +PNP8209 Zenith Data Systems Z-Note +PNP820a Zenith Data Systems NE2000-Compatible +PNP8213 Xircom Pocket Ethernet II +PNP8214 Xircom Pocket Ethernet I +PNP821d RadiSys EXM-10 +PNP8227 SMC 3000 Series +PNP8228 SMC 91C2 controller +PNP8231 Advanced Micro Devices AM2100/AM1500T +PNP8263 Tulip NCC-16 +PNP8277 Exos 105 +PNP828A Intel '595 based Ethernet +PNP828B TI2000-style Token Ring +PNP828C AMD PCNet Family cards +PNP828D AMD PCNet32 (VL version) +PNP8294 IrDA Infrared NDIS driver (Microsoft-supplied) +PNP82bd IBM PCMCIA-NIC +PNP82C2 Xircom CE10 +PNP82C3 Xircom CEM2 +PNP8321 DEC Ethernet (All Types) +PNP8323 SMC EtherCard (All Types except 8013/A) +PNP8324 ARCNET Compatible +PNP8326 Thomas Conrad (All Arcnet Types) +PNP8327 IBM Token Ring (All Types) +PNP8385 Remote Network Access Driver +PNP8387 RNA Point-to-point Protocol Driver +PNP8388 Reserved for Microsoft Networking components +PNP8389 Peer IrLAN infrared driver (Microsoft-supplied) +PNP8390 Generic network adapter + +PNPA002 Future Domain 16-700 compatible controller +PNPA003 Panasonic proprietary CD-ROM adapter (SBPro/SB16) +PNPA01B Trantor 128 SCSI Controller +PNPA01D Trantor T160 SCSI Controller +PNPA01E Trantor T338 Parallel SCSI controller +PNPA01F Trantor T348 Parallel SCSI controller +PNPA020 Trantor Media Vision SCSI controller +PNPA022 Always IN-2000 SCSI controller +PNPA02B Sony proprietary CD-ROM controller +PNPA02D Trantor T13b 8-bit SCSI controller +PNPA02F Trantor T358 Parallel SCSI controller +PNPA030 Mitsumi LU-005 Single Speed CD-ROM controller + drive +PNPA031 Mitsumi FX-001 Single Speed CD-ROM controller + drive +PNPA032 Mitsumi FX-001 Double Speed CD-ROM controller + drive + +PNPB000 Sound Blaster 1.5 sound device +PNPB001 Sound Blaster 2.0 sound device +PNPB002 Sound Blaster Pro sound device +PNPB003 Sound Blaster 16 sound device +PNPB004 Thunderboard-compatible sound device +PNPB005 Adlib-compatible FM synthesizer device +PNPB006 MPU401 compatible +PNPB007 Microsoft Windows Sound System-compatible sound device +PNPB008 Compaq Business Audio +PNPB009 Plug and Play Microsoft Windows Sound System Device +PNPB00A MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Disabled) +PNPB00B MediaVision Pro Audio 3D +PNPB00C MusicQuest MQX-32M +PNPB00D MediaVision Pro Audio Spectrum Basic (No Trantor SCSI, Thunder Chip Enabled) +PNPB00E MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Enabled) +PNPB00F MediaVision Jazz-16 chipset (OEM Versions) +PNPB010 Auravision VxP500 chipset - Orchid Videola +PNPB018 MediaVision Pro Audio Spectrum 8-bit +PNPB019 MediaVision Pro Audio Spectrum Basic (no Trantor SCSI, Thunder chip Disabled) +PNPB020 Yamaha OPL3-compatible FM synthesizer device +PNPB02F Joystick/Game port + +PNPC000 Compaq 14400 Modem (TBD) +PNPC001 Compaq 2400/9600 Modem (TBD) diff --git a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt index c420c5e75..db3beef98 100644 --- a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt +++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt @@ -32,13 +32,6 @@ function( add_dbus_xml option basename classname namespace xmlfile ) add_custom_command( OUTPUT ${basename}.cpp ${basename}.h COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null DEPENDS ${INTROSPECTIONPATH}/${xmlfile} ) - if( "${option}" STREQUAL "p" ) - add_custom_command( OUTPUT ${basename}.moc - COMMAND ${TMOC_EXECUTABLE} ${basename}.h -o ${basename}.moc - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.h ) - set_property( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${basename}.cpp APPEND - PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.moc ) - endif( ) endfunction( ) add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml ) @@ -61,7 +54,7 @@ add_dbus_xml( p connectionsettings ConnectionSettingsInterface DBus nm-settings- # build the library -tde_add_library( tdenm_dbus STATIC_PIC +tde_add_library( tdenm_dbus STATIC_PIC AUTOMOC SOURCES networkmanagerproxy.cpp networkmanagerpppproxy.cpp deviceproxy.cpp bluetoothproxy.cpp olpcmeshproxy.cpp ethernetproxy.cpp diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp index 3e8ef6daa..f41f5cbc8 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp @@ -1259,23 +1259,23 @@ TDENetworkConnectionManager_BackendNM::TDENetworkConnectionManager_BackendNM(TDE } // Connect global signals - connect(d->m_networkManagerProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); // Connect VPN signals if (d->m_vpnProxy) { - connect(d->m_vpnProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessVPNStateChanged(TQ_UINT32))); - connect(d->m_vpnProxy, SIGNAL(LoginBanner(const TQString&)), d, SLOT(internalProcessVPNLoginBanner(const TQString&))); - connect(d->m_vpnProxy, SIGNAL(Failure(TQ_UINT32)), d, SLOT(internalProcessVPNFailure(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNStateChanged(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(LoginBanner(const TQString&)), d, TQ_SLOT(internalProcessVPNLoginBanner(const TQString&))); + connect(d->m_vpnProxy, TQ_SIGNAL(Failure(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNFailure(TQ_UINT32))); } // Connect local signals if (d->m_networkDeviceProxy) { - connect(d->m_networkDeviceProxy, SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); + connect(d->m_networkDeviceProxy, TQ_SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, TQ_SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); } if (d->m_wiFiDeviceProxy) { - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, TQ_SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); } // Create public lists @@ -1510,7 +1510,7 @@ void TDENetworkConnectionManager_BackendNMPrivate::internalProcessWiFiAccessPoin // Set up monitoring object DBus::AccessPointProxy* apProxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, dbuspath); apProxy->setConnection(TQT_DBusConnection::systemBus()); - connect(apProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); + connect(apProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, TQ_SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&))); m_accessPointProxyList[dbuspath] = (apProxy); // Notify client applications @@ -1599,7 +1599,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -1922,14 +1922,14 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { } #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s\n", (*it).data()); fflush(stdout); + printf("[network-manager comm debug] %s\n", (*it).local8Bit().data()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it)); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); - connect(&connectionSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -3055,7 +3055,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSecretsAsync(asyncCallID, group, error); if (ret && error.isValid()) { @@ -3260,7 +3260,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4492,7 +4492,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Save connection settings to the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(UpdateAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(UpdateAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.UpdateAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4526,8 +4526,8 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Create new connection - connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = d->m_networkManagerSettings->AddConnectionAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4580,7 +4580,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) { // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(DeleteAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(DeleteAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.DeleteAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4804,8 +4804,8 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerProxy, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->ActivateConnectionAsync(asyncCallID, existingConnection, TQT_DBusObjectPath(d->m_dbusDeviceString.ascii()), TQT_DBusObjectPath("/"), error); @@ -4941,34 +4941,39 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() TDENetworkVPNTypeList ret; // Query NetworkManager to verify plugin availability before claiming support for a VPN type - TQDir serviceDir(NM_PLUGIN_SERVICE_DIR, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Files); - TQStringList services = serviceDir.entryList ().grep (".name", true); - - if (services.count () > 0) { - // read in all available Services - for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { - TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i; - TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config"); - tdeconfig->setGroup ("VPN Connection"); - - TQString serviceName = tdeconfig->readEntry("name", TQString()); - serviceName = serviceName.lower(); - - if (serviceName == "openvpn") { - ret.append(TDENetworkVPNType::OpenVPN); - } - if (serviceName == "pptp") { - ret.append(TDENetworkVPNType::PPTP); - } - if (serviceName == "strongswan") { - ret.append(TDENetworkVPNType::StrongSwan); - } - if (serviceName == "vpnc") { - ret.append(TDENetworkVPNType::VPNC); - } + // Look in the LIB directory first, since that seems to be where plugins are stored nowadays. + TQDir libServiceDir(NM_PLUGIN_SERVICE_DIR_LIB, "*.name", TQDir::Name | TQDir::IgnoreCase, TQDir::Files); + TQDir etcServiceDir(NM_PLUGIN_SERVICE_DIR_ETC, "*.name", TQDir::Name | TQDir::IgnoreCase, TQDir::Files); + TQStringList services = libServiceDir.entryList() + etcServiceDir.entryList(); + size_t libEntryCount = libServiceDir.count(); + + // Read in all services. + for (size_t i = 0; i < services.count(); ++i) + { + TQString fileName = TQString("%1/").arg(i < libEntryCount ? NM_PLUGIN_SERVICE_DIR_LIB : NM_PLUGIN_SERVICE_DIR_ETC) + services[i]; + TDEConfig *config = new TDEConfig(fileName, true, true, "config"); + config->setGroup("VPN Connection"); - delete tdeconfig; + TQString serviceName = config->readEntry("name", TQString("")); + serviceName = serviceName.lower(); + if (serviceName == "openvpn") + { + ret.append(TDENetworkVPNType::OpenVPN); + } + if (serviceName == "pptp") + { + ret.append(TDENetworkVPNType::PPTP); + } + if (serviceName == "strongswan") + { + ret.append(TDENetworkVPNType::StrongSwan); + } + if (serviceName == "vpnc") + { + ret.append(TDENetworkVPNType::VPNC); } + + delete config; } return ret; @@ -5000,7 +5005,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(DeactivateConnectionAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(DeactivateConnectionAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->DeactivateConnectionAsync(asyncCallID, existingConnection, error); @@ -5441,7 +5446,7 @@ TDENetworkConnectionManager_BackendNMPrivate::TDENetworkConnectionManager_Backen // Set up global signal handler m_dbusSignalConnection = new TQT_DBusConnection(TQT_DBusConnection::systemBus()); m_dbusSignalReceiver = new TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(this); - m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQT_SLOT(dbusSignal(const TQT_DBusMessage&))); + m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQ_SLOT(dbusSignal(const TQT_DBusMessage&))); } TDENetworkConnectionManager_BackendNMPrivate::~TDENetworkConnectionManager_BackendNMPrivate() { diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h index f14e4992e..241e83706 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h @@ -18,6 +18,7 @@ #ifndef _TDENETWORKBACKEND_NETWORKMANAGER_H #define _TDENETWORKBACKEND_NETWORKMANAGER_H +#include "config.h" #include "tdenetworkconnections.h" //==================================================================================================== @@ -142,7 +143,8 @@ #define NM_802_11_DEVICE_CAP_WPA 0x10 #define NM_802_11_DEVICE_CAP_RSN 0x20 //==================================================================================================== -#define NM_PLUGIN_SERVICE_DIR "/etc/NetworkManager/VPN" +#define NM_PLUGIN_SERVICE_DIR_ETC "/etc/NetworkManager/VPN" // old plugin location +#define NM_PLUGIN_SERVICE_DIR_LIB NM_VPN_SERVICE_DIR // new plugin location //==================================================================================================== //==================================================================================================== @@ -211,7 +213,7 @@ class TDENetworkConnectionManager_BackendNMPrivate; class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNM(TDENetworkDevice* networkDevice); diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h index 61ce31329..43cafda25 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h @@ -71,7 +71,7 @@ class TDENetworkConnectionManager_BackendNMPrivate; class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(TDENetworkConnectionManager_BackendNMPrivate*); @@ -86,7 +86,7 @@ class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject class TDENetworkConnectionManager_BackendNMPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDENetworkConnectionManager_BackendNMPrivate(TDENetworkConnectionManager_BackendNM*); diff --git a/tdecore/tdehw/tdecpudevice.cpp b/tdecore/tdehw/tdecpudevice.cpp index 40b9ad6e2..6715000a0 100644 --- a/tdecore/tdehw/tdecpudevice.cpp +++ b/tdecore/tdehw/tdecpudevice.cpp @@ -30,13 +30,13 @@ #include "config.h" // uPower -#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_HAL) +#if defined(WITH_TDEHWLIB_DAEMONS) #include <tqdbusdata.h> #include <tqdbusmessage.h> #include <tqdbusproxy.h> #include <tqdbusvariant.h> #include <tqdbusconnection.h> -#endif // defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_HAL) +#endif TDECPUDevice::TDECPUDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) { @@ -151,23 +151,6 @@ bool TDECPUDevice::canSetGovernor() { } #endif // WITH_TDEHWLIB_DAEMONS -#ifdef WITH_HAL - { - TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if (dbusConn.isConnected()) { - TQT_DBusMessage msg = TQT_DBusMessage::methodCall( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.CPUFreq", - "GetCPUFreqGovernor"); - TQT_DBusMessage reply = dbusConn.sendWithReply(msg); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return true; - } - } - } -#endif // WITH_HAL - return false; } @@ -201,24 +184,6 @@ void TDECPUDevice::setGovernor(TQString gv) { } #endif // WITH_TDEHWLIB_DAEMONS -#ifdef WITH_HAL - if ( !setGovernorDone ) { - TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if (dbusConn.isConnected()) { - TQT_DBusProxy cpuFreqControl("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.CPUFreq", dbusConn); - if (cpuFreqControl.canSend()) { - // set CPU governor - TQValueList<TQT_DBusData> params; - params << TQT_DBusData::fromString(gv.lower()); - TQT_DBusMessage reply = cpuFreqControl.sendWithReply("SetCPUFreqGovernor", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - setGovernorDone = true; - } - } - } - } -#endif // WITH_HAL - // Force update of the device information object if ( setGovernorDone ) { TDEGlobal::hardwareDevices()->processModifiedCPUs(); diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index 808b54000..2ac87af86 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -25,9 +25,9 @@ #include <tqpixmap.h> #include <tqtimer.h> -#include <ntqthread.h> -#include <ntqeventloop.h> -#include <ntqapplication.h> +#include <tqthread.h> +#include <tqeventloop.h> +#include <tqapplication.h> #include "tdeglobal.h" #include "tdelocale.h" @@ -509,9 +509,9 @@ void TDECryptographicCardDevice::enableCardMonitoring(bool enable) { m_watcherObject->cardDevice = this; m_watcherObject->moveToThread(m_watcherThread); - TQObject::connect(m_watcherObject, SIGNAL(statusChanged(TQString,TQString)), this, SLOT(cardStatusChanged(TQString,TQString))); - TQObject::connect(m_watcherObject, SIGNAL(pinRequested(TQString)), this, SLOT(workerRequestedPin(TQString))); - TQTimer::singleShot(0, m_watcherObject, SLOT(run())); + TQObject::connect(m_watcherObject, TQ_SIGNAL(statusChanged(TQString,TQString)), this, TQ_SLOT(cardStatusChanged(TQString,TQString))); + TQObject::connect(m_watcherObject, TQ_SIGNAL(pinRequested(TQString)), this, TQ_SLOT(workerRequestedPin(TQString))); + TQTimer::singleShot(0, m_watcherObject, TQ_SLOT(run())); m_watcherThread->start(); } @@ -635,7 +635,6 @@ TQString TDECryptographicCardDevice::autoPIN() { ASN1_TYPE* asnValue = otherName->value; if (asnValue) { // Found autopin structure - int index; ASN1_TYPE* asnSeqValue = NULL; ASN1_GENERALSTRING* asnGeneralString = NULL; STACK_OF(ASN1_TYPE) *asnSeqValueStack = NULL; @@ -643,9 +642,15 @@ TQString TDECryptographicCardDevice::autoPIN() { int asn1SeqValueObjectTag; int asn1SeqValueObjectClass; int returnCode; + int index = 0; // Search for the PIN field - index = 0; // Search for the PIN field - asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(ASN1_STRING_data(asnValue->value.sequence), ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + const uint8_t* asnSeqValueString = ASN1_STRING_get0_data(asnValue->value.sequence); + asnSeqValueStack = d2i_ASN1_SEQUENCE_ANY(NULL, &asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence)); +#else + uint8_t* asnSeqValueString = ASN1_STRING_data(asnValue->value.sequence); + asnSeqValueStack = ASN1_seq_unpack_ASN1_TYPE(asnSeqValueString, ASN1_STRING_length(asnValue->value.sequence), d2i_ASN1_TYPE, ASN1_TYPE_free); +#endif asnSeqValue = sk_ASN1_TYPE_value(asnSeqValueStack, index); if (asnSeqValue) { if (asnSeqValue->value.octet_string->data[0] == ((V_ASN1_CONSTRUCTED | V_ASN1_CONTEXT_SPECIFIC) + index)) { @@ -654,12 +659,19 @@ TQString TDECryptographicCardDevice::autoPIN() { if (!(returnCode & 0x80)) { if (returnCode == (V_ASN1_CONSTRUCTED + index)) { if (d2i_ASN1_GENERALSTRING(&asnGeneralString, &asn1SeqValueObjectData, asn1SeqValueObjectLength) != NULL) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + retString = TQString((const char *)ASN1_STRING_get0_data(asnGeneralString)); +#else retString = TQString((const char *)ASN1_STRING_data(asnGeneralString)); +#endif } } } } } +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + sk_ASN1_TYPE_pop_free(asnSeqValueStack, ASN1_TYPE_free); +#endif } } } diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h index 0907322d7..8b3bd211a 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.h +++ b/tdecore/tdehw/tdecryptographiccarddevice.h @@ -38,7 +38,7 @@ typedef TQValueListIterator<X509*> X509CertificatePtrListIterator; class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp index ac92599ae..3223e80e7 100644 --- a/tdecore/tdehw/tdeeventdevice.cpp +++ b/tdecore/tdehw/tdeeventdevice.cpp @@ -120,9 +120,11 @@ void TDEEventDevice::internalReadProvidedSwitches() { if (BIT_IS_SET(switches, SW_RFKILL_ALL)) { supportedSwitches = supportedSwitches | TDESwitchType::RFKill; } +# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL if (BIT_IS_SET(switches, SW_RADIO)) { supportedSwitches = supportedSwitches | TDESwitchType::Radio; } +# endif if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) { supportedSwitches = supportedSwitches | TDESwitchType::MicrophoneInsert; } @@ -229,9 +231,11 @@ void TDEEventDevice::internalReadActiveSwitches() { if (BIT_IS_SET(switches, SW_RFKILL_ALL)) { activeSwitches = activeSwitches | TDESwitchType::RFKill; } +# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL if (BIT_IS_SET(switches, SW_RADIO)) { activeSwitches = activeSwitches | TDESwitchType::Radio; } +# endif if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) { activeSwitches = activeSwitches | TDESwitchType::MicrophoneInsert; } @@ -345,7 +349,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { if (eventType() != TDEEventDeviceType::Unknown) { if (m_fd >= 0) { m_eventNotifier = new TQSocketNotifier(m_fd, TQSocketNotifier::Read, this); - connect( m_eventNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(eventReceived()) ); + connect( m_eventNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(eventReceived()) ); m_monitorActive = true; } } @@ -353,7 +357,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { // get initial state of switches internalReadProvidedSwitches(); internalReadActiveSwitches(); - connect( this, TQT_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQT_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); + connect( this, TQ_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQ_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); } } } @@ -383,9 +387,9 @@ void TDEEventDevice::processActiveSwitches() { } void TDEEventDevice::connectNotify( const char* signal ) { - if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) { + if( !m_monitorActive && qstrcmp( signal, TQ_SIGNAL(switchChanged())) == 0 ) { m_watchTimer = new TQTimer(this); - connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) ); + connect( m_watchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processActiveSwitches()) ); m_watchTimer->start( 2500, false ); m_monitorActive = true; diff --git a/tdecore/tdehw/tdeeventdevice.h b/tdecore/tdehw/tdeeventdevice.h index 64130508c..a1f1af6a6 100644 --- a/tdecore/tdehw/tdeeventdevice.h +++ b/tdecore/tdehw/tdeeventdevice.h @@ -79,7 +79,7 @@ class TQSocketNotifier; class TDECORE_EXPORT TDEEventDevice : public TDEGenericDevice { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tdegenericdevice.cpp b/tdecore/tdehw/tdegenericdevice.cpp index 8662e5e8e..e9a645cf1 100644 --- a/tdecore/tdehw/tdegenericdevice.cpp +++ b/tdecore/tdehw/tdegenericdevice.cpp @@ -91,8 +91,8 @@ TQString TDEGenericDevice::deviceNode() { return m_deviceNode; } -void TDEGenericDevice::internalSetDeviceNode(TQString sn) { - m_deviceNode = sn; +void TDEGenericDevice::internalSetDeviceNode(TQString dn) { + m_deviceNode = dn; } TQString TDEGenericDevice::deviceBus() { diff --git a/tdecore/tdehw/tdegenericdevice.h b/tdecore/tdehw/tdegenericdevice.h index 7536b44a7..53804cf96 100644 --- a/tdecore/tdehw/tdegenericdevice.h +++ b/tdecore/tdehw/tdegenericdevice.h @@ -30,7 +30,7 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -231,7 +231,7 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject * * This method is non-portable, so be careful! */ - void internalSetDeviceNode(TQString sn); + void internalSetDeviceNode(TQString dn); /** * @param bl true if this device has been blacklisted for update actions diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index b700ac3ab..2471c8341 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdelocale.h> @@ -89,22 +89,13 @@ timespec diff(timespec start, timespec end) return temp; } -// BEGIN BLOCK -// Copied from include/linux/genhd.h -#define GENHD_FL_REMOVABLE 1 -#define GENHD_FL_MEDIA_CHANGE_NOTIFY 4 -#define GENHD_FL_CD 8 -#define GENHD_FL_UP 16 -#define GENHD_FL_SUPPRESS_PARTITION_INFO 32 -#define GENHD_FL_EXT_DEVT 64 -#define GENHD_FL_NATIVE_CAPACITY 128 -#define GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE 256 -// END BLOCK - // NOTE TO DEVELOPERS // This command will greatly help when attempting to find properties to distinguish one device from another // udevadm info --query=all --path=/sys/.... +// Some local utility functions and constants +namespace { + // This routine is courtsey of an answer on "Stack Overflow" // It takes an LSB-first int and makes it an MSB-first int (or vice versa) unsigned int reverse_bits(unsigned int x) @@ -116,15 +107,36 @@ unsigned int reverse_bits(unsigned int x) return((x >> 16) | (x << 16)); } +// Read the content of a file that supposed to contain a single line +TQString readLineFile(TQString fname) { + TQFile file( fname ); + if ( file.open( IO_ReadOnly ) ) { + TQTextStream stream( &file ); + return stream.readLine(); + } else { + return TQString::null; + } +} + +} // namespace + // Helper function implemented in tdestoragedevice.cpp TQString decodeHexEncoding(TQString str); +extern "C" { + TDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices() + { + return new TDEHardwareDevices(); + } +} + TDEHardwareDevices::TDEHardwareDevices() { // Initialize members pci_id_map = 0; usb_id_map = 0; pnp_id_map = 0; dpy_id_map = 0; + m_unclassifiedDevices = TQStringList(); // Set up device list m_deviceList.setAutoDelete( true ); // the list owns the objects @@ -144,7 +156,7 @@ TDEHardwareDevices::TDEHardwareDevices() { int udevmonitorfd = udev_monitor_get_fd(m_udevMonitorStruct); if (udevmonitorfd >= 0) { m_devScanNotifier = new TQSocketNotifier(udevmonitorfd, TQSocketNotifier::Read, this); - connect( m_devScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHotPluggedHardware()) ); + connect( m_devScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHotPluggedHardware()) ); } // Read in the current mount table @@ -166,7 +178,7 @@ TDEHardwareDevices::TDEHardwareDevices() { m_procMountsFd = open("/proc/mounts", O_RDONLY, 0); if (m_procMountsFd >= 0) { m_mountScanNotifier = new TQSocketNotifier(m_procMountsFd, TQSocketNotifier::Exception, this); - connect( m_mountScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processModifiedMounts()) ); + connect( m_mountScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processModifiedMounts()) ); } // Read in the current cpu information @@ -188,22 +200,22 @@ TDEHardwareDevices::TDEHardwareDevices() { // Monitor for changed cpu information // Watched directories are set up during the initial CPU scan m_cpuWatch = new KSimpleDirWatch(this); - connect( m_cpuWatch, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(processModifiedCPUs()) ); + connect( m_cpuWatch, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(processModifiedCPUs()) ); #else m_cpuWatchTimer = new TQTimer(this); - connect( m_cpuWatchTimer, SIGNAL(timeout()), this, SLOT(processModifiedCPUs()) ); + connect( m_cpuWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processModifiedCPUs()) ); #endif // Some devices do not receive update signals from udev // These devices must be polled, and a good polling interval is 1 second m_deviceWatchTimer = new TQTimer(this); - connect( m_deviceWatchTimer, SIGNAL(timeout()), this, SLOT(processStatelessDevices()) ); + connect( m_deviceWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processStatelessDevices()) ); - // Special case for battery polling (longer delay, 5 seconds) + // Special case for battery and power supply polling (longer delay, 5 seconds) m_batteryWatchTimer = new TQTimer(this); - connect( m_batteryWatchTimer, SIGNAL(timeout()), this, SLOT(processBatteryDevices()) ); + connect( m_batteryWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processBatteryDevices()) ); - // Update internal device information + // Update internal device information. queryHardwareInformation(); } } @@ -274,18 +286,21 @@ void TDEHardwareDevices::setBatteryUpdatesEnabled(bool enable) { } } -void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice) { - rescanDeviceInformation(hwdevice, true); -} - -void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree) { - struct udev_device *dev; - dev = udev_device_new_from_syspath(m_udevStruct, hwdevice->systemPath().ascii()); - updateExistingDeviceInformation(hwdevice); +void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice, udev_device* dev, bool regenerateDeviceTree) { + bool toUnref = false; + if (!dev) + { + dev = udev_device_new_from_syspath(m_udevStruct, hwdevice->systemPath().ascii()); + toUnref = true; + } + updateExistingDeviceInformation(hwdevice, dev); if (regenerateDeviceTree) { updateParentDeviceInformation(hwdevice); // Update parent/child tables for this device } - udev_device_unref(dev); + if (toUnref) + { + udev_device_unref(dev); + } } TDEGenericDevice* TDEHardwareDevices::findBySystemPath(TQString syspath) { @@ -348,6 +363,13 @@ TDEGenericDevice* TDEHardwareDevices::findByDeviceNode(TQString devnode) { if (hwdevice->deviceNode() == devnode) { return hwdevice; } + // For storage devices, check also against the mapped name + TDEStorageDevice *sdevice = dynamic_cast<TDEStorageDevice*>(hwdevice); + if (sdevice) { + if (sdevice->mappedName() == devnode) { + return sdevice; + } + } } return 0; @@ -368,15 +390,14 @@ TDEStorageDevice* TDEHardwareDevices::findDiskByUID(TQString uid) { } void TDEHardwareDevices::processHotPluggedHardware() { - udev_device* dev = udev_monitor_receive_device(m_udevMonitorStruct); + udev_device *dev = udev_monitor_receive_device(m_udevMonitorStruct); if (dev) { TQString actionevent(udev_device_get_action(dev)); if (actionevent == "add") { - TDEGenericDevice* device = classifyUnknownDevice(dev); + TDEGenericDevice *device = classifyUnknownDevice(dev); // Make sure this device is not a duplicate - TDEGenericDevice *hwdevice; - for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) { + for (TDEGenericDevice *hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) { if (hwdevice->systemPath() == device->systemPath()) { delete device; device = 0; @@ -388,7 +409,18 @@ void TDEHardwareDevices::processHotPluggedHardware() { m_deviceList.append(device); updateParentDeviceInformation(device); // Update parent/child tables for this device emit hardwareAdded(device); - emit hardwareEvent(TDEHardwareEvent::HardwareAdded, device->uniqueID()); + if (device->type() == TDEGenericDeviceType::Disk) { + // Make sure slave status is also updated + TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device); + TQStringList slavedevices = sdevice->slaveDevices(); + for (TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit) { + TDEGenericDevice* slavedevice = findBySystemPath(*slaveit); + if (slavedevice && slavedevice->type() == TDEGenericDeviceType::Disk) { + rescanDeviceInformation(slavedevice); + emit hardwareUpdated(slavedevice); + } + } + } } } else if (actionevent == "remove") { @@ -398,34 +430,25 @@ void TDEHardwareDevices::processHotPluggedHardware() { TDEGenericDevice *hwdevice; for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) { if (hwdevice->systemPath() == systempath) { - // Temporarily disable auto-deletion to ensure object validity when calling the Removed events below - m_deviceList.setAutoDelete(false); - - // If the device is a storage device and has a slave, update it as well + // Make sure slave status is also updated if (hwdevice->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); TQStringList slavedevices = sdevice->slaveDevices(); - m_deviceList.remove(hwdevice); - for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) { + for (TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit) { TDEGenericDevice* slavedevice = findBySystemPath(*slaveit); - if (slavedevice) { + if (slavedevice && slavedevice->type() == TDEGenericDeviceType::Disk) { rescanDeviceInformation(slavedevice); emit hardwareUpdated(slavedevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID()); } } } - else { - m_deviceList.remove(hwdevice); - } - - emit hardwareRemoved(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareRemoved, hwdevice->uniqueID()); - - // Reenable auto-deletion and delete the removed device object - m_deviceList.setAutoDelete(true); - delete hwdevice; + rescanDeviceInformation(hwdevice, dev); + if (m_deviceList.find(hwdevice) != -1 && m_deviceList.take()) + { + emit hardwareRemoved(hwdevice); + delete hwdevice; + } break; } } @@ -438,10 +461,8 @@ void TDEHardwareDevices::processHotPluggedHardware() { for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) { if (hwdevice->systemPath() == systempath) { if (!hwdevice->blacklistedForUpdate()) { - classifyUnknownDevice(dev, hwdevice, false); - updateParentDeviceInformation(hwdevice); // Update parent/child tables for this device + rescanDeviceInformation(hwdevice, dev); emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); } } else if ((hwdevice->type() == TDEGenericDeviceType::Monitor) @@ -453,7 +474,6 @@ void TDEHardwareDevices::processHotPluggedHardware() { udev_device_unref(slavedev); updateParentDeviceInformation(hwdevice); // Update parent/child tables for this device emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); } } } @@ -849,7 +869,6 @@ void TDEHardwareDevices::processModifiedCPUs() { if (hwdevice) { // Signal new information available emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); } } } @@ -876,10 +895,11 @@ void TDEHardwareDevices::processStatelessDevices() { // We can't use m_deviceList directly as m_deviceList can only have one iterator active against it at any given time TDEGenericHardwareList devList = listAllPhysicalDevices(); for ( hwdevice = devList.first(); hwdevice; hwdevice = devList.next() ) { - if ((hwdevice->type() == TDEGenericDeviceType::RootSystem) || (hwdevice->type() == TDEGenericDeviceType::Network) || (hwdevice->type() == TDEGenericDeviceType::OtherSensor) || (hwdevice->type() == TDEGenericDeviceType::Event) || (hwdevice->type() == TDEGenericDeviceType::Battery) || (hwdevice->type() == TDEGenericDeviceType::PowerSupply)) { - rescanDeviceInformation(hwdevice, false); + if ((hwdevice->type() == TDEGenericDeviceType::RootSystem) || (hwdevice->type() == TDEGenericDeviceType::Network) || + (hwdevice->type() == TDEGenericDeviceType::OtherSensor) || (hwdevice->type() == TDEGenericDeviceType::Event) || + (hwdevice->type() == TDEGenericDeviceType::Battery) || (hwdevice->type() == TDEGenericDeviceType::PowerSupply)) { + rescanDeviceInformation(hwdevice, NULL, false); emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); #ifdef STATELESSPROFILING clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2); printf("TDEHardwareDevices::processStatelessDevices() : '%s' finished at %u [%u]\n", (hwdevice->name()).ascii(), time2.tv_nsec, diff(time1,time2).tv_nsec); @@ -902,9 +922,16 @@ void TDEHardwareDevices::processBatteryDevices() { TDEGenericHardwareList devList = listAllPhysicalDevices(); for ( hwdevice = devList.first(); hwdevice; hwdevice = devList.next() ) { if (hwdevice->type() == TDEGenericDeviceType::Battery) { - rescanDeviceInformation(hwdevice, false); + rescanDeviceInformation(hwdevice, NULL, false); emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); + } + else if (hwdevice->type() == TDEGenericDeviceType::PowerSupply) { + TDEMainsPowerDevice *pdevice = dynamic_cast<TDEMainsPowerDevice*>(hwdevice); + int previousOnlineState = pdevice->online(); + rescanDeviceInformation(hwdevice, NULL, false); + if (pdevice->online() != previousOnlineState) { + emit hardwareUpdated(hwdevice); + } } } } @@ -917,7 +944,6 @@ void TDEHardwareDevices::processEventDeviceKeyPressed(unsigned int keycode, TDEE void TDEHardwareDevices::processModifiedMounts() { // Detect what changed between the old mount table and the new one, // and emit appropriate events - TQMap<TQString, bool> deletedEntries = m_mountTable; // Read in the new mount table @@ -943,52 +969,28 @@ void TDEHardwareDevices::processModifiedMounts() { } } + // Added devices TQMap<TQString, bool>::Iterator it; for ( it = addedEntries.begin(); it != addedEntries.end(); ++it ) { - TQStringList mountInfo = TQStringList::split(" ", it.key(), true); // Try to find a device that matches the altered node + TQStringList mountInfo = TQStringList::split(" ", it.key(), true); TDEGenericDevice* hwdevice = findByDeviceNode(*mountInfo.at(0)); - if (hwdevice) { + if (hwdevice && hwdevice->type() == TDEGenericDeviceType::Disk) { + rescanDeviceInformation(hwdevice); emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); - // If the device is a storage device and has a slave, update it as well - if (hwdevice->type() == TDEGenericDeviceType::Disk) { - TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); - TQStringList slavedevices = sdevice->slaveDevices(); - for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) { - TDEGenericDevice* slavedevice = findBySystemPath(*slaveit); - if (slavedevice) { - emit hardwareUpdated(slavedevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID()); - } - } - } } } + + // Removed devices for ( it = deletedEntries.begin(); it != deletedEntries.end(); ++it ) { - TQStringList mountInfo = TQStringList::split(" ", it.key(), true); // Try to find a device that matches the altered node + TQStringList mountInfo = TQStringList::split(" ", it.key(), true); TDEGenericDevice* hwdevice = findByDeviceNode(*mountInfo.at(0)); - if (hwdevice) { + if (hwdevice && hwdevice->type() == TDEGenericDeviceType::Disk) { + rescanDeviceInformation(hwdevice); emit hardwareUpdated(hwdevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID()); - // If the device is a storage device and has a slave, update it as well - if (hwdevice->type() == TDEGenericDeviceType::Disk) { - TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); - TQStringList slavedevices = sdevice->slaveDevices(); - for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) { - TDEGenericDevice* slavedevice = findBySystemPath(*slaveit); - if (slavedevice) { - emit hardwareUpdated(slavedevice); - emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID()); - } - } - } } } - - emit mountTableModified(); - emit hardwareEvent(TDEHardwareEvent::MountTableModified, TQString()); } TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQString devicenode, const TQString devicebus, const TQString disktypestring, const TQString systempath, const TQString devicevendor, const TQString devicemodel, const TQString filesystemtype, const TQString devicedriver) { @@ -1961,7 +1963,9 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD || (devicesubsystem == "scsi_tape")) && ((devicenode != "") )) { - if (!device) device = new TDEStorageDevice(TDEGenericDeviceType::Disk); + if (!device) { + device = new TDEStorageDevice(TDEGenericDeviceType::Disk); + } } else if (devicetype == "host") { if (devicesubsystem == "bluetooth") { @@ -2157,7 +2161,8 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (devicesubsystem == "nd") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::RAM); } - if (devicesubsystem == "ptp") { + if (devicesubsystem == "ptp" + || (devicesubsystem == "rtc")) { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Timekeeping); } if (devicesubsystem == "leds") { @@ -2191,8 +2196,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (devicesubsystem == "mmc") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform); } - if ((devicesubsystem == "event_source") - || (devicesubsystem == "rtc")) { + if (devicesubsystem == "event_source") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Mainboard); } if (devicesubsystem == "bsg") { @@ -2416,7 +2420,12 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (device == 0) { // Unhandled if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Other); - printf("[FIXME] UNCLASSIFIED DEVICE name: %s type: %s subsystem: %s driver: %s [Node Path: %s] [Syspath: %s] [%s:%s]\n", devicename.ascii(), devicetype.ascii(), devicesubsystem.ascii(), devicedriver.ascii(), devicenode.ascii(), udev_device_get_syspath(dev), devicevendorid.ascii(), devicemodelid.ascii()); fflush(stdout); + if (!m_unclassifiedDevices.contains(devicename)) + { + m_unclassifiedDevices.append(devicename); + printf("[FIXME] UNCLASSIFIED DEVICE name: %s type: %s subsystem: %s driver: %s [Node Path: %s] [Syspath: %s] [%s:%s]\n", + devicename.ascii(), devicetype.ascii(), devicesubsystem.ascii(), devicedriver.ascii(), devicenode.ascii(), udev_device_get_syspath(dev), devicevendorid.ascii(), devicemodelid.ascii()); fflush(stdout); + } } // Root devices are special @@ -2460,7 +2469,11 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD return device; } -void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* existingdevice, udev_device* dev) { +void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *device, udev_device *dev) { + if (!device) { + return; + } + TQString devicename; TQString devicetype; TQString devicedriver; @@ -2476,7 +2489,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist TQString devicetypestring; TQString devicetypestring_alt; TQString devicepciclass; - TDEGenericDevice* device = existingdevice; bool temp_udev_device = !dev; devicename = device->name(); @@ -2509,36 +2521,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist sdevice->internalSetFileSystemName("pictbridge"); } else { - bool removable = false; - bool hotpluggable = false; - - // We can get the removable flag, but we have no idea if the device has the ability to notify on media insertion/removal - // If there is no such notification possible, then we should not set the removable flag - // udev can be such an amazing pain at times - // It exports a /capabilities node with no info on what the bits actually mean - // This information is very poorly documented as a set of #defines in include/linux/genhd.h - // We are specifically interested in GENHD_FL_REMOVABLE and GENHD_FL_MEDIA_CHANGE_NOTIFY - // The "removable" flag should also really be renamed to "hotpluggable", as that is far more precise... - TQString capabilitynodename = systempath; - capabilitynodename.append("/capability"); - TQFile capabilityfile( capabilitynodename ); - unsigned int capabilities = 0; - if ( capabilityfile.open( IO_ReadOnly ) ) { - TQTextStream stream( &capabilityfile ); - TQString capabilitystring; - capabilitystring = stream.readLine(); - capabilities = capabilitystring.toUInt(); - capabilityfile.close(); - } - if (capabilities & GENHD_FL_REMOVABLE) { - // FIXME - // For added fun this is not always true; i.e. GENHD_FL_REMOVABLE can be set when the device cannot be hotplugged (floppy drives). - hotpluggable = true; - } - if (capabilities & GENHD_FL_MEDIA_CHANGE_NOTIFY) { - removable = true; - } - // See if any other devices are exclusively using this device, such as the Device Mapper TQStringList holdingDeviceNodes; TQString holdersnodename = udev_device_get_syspath(dev); @@ -2617,6 +2599,15 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist device = classifyUnknownDeviceByExternalRules(dev, device, true); // Check external rules for possible subtype overrides disktype = sdevice->diskType(); // The type can be overridden by an external rule + // Set unlocked crypt flag is device has any holders + if ((filesystemtype.upper() == "CRYPTO_LUKS" || filesystemtype.upper() == "CRYPTO") && + holdingDeviceNodes.count() > 0) { + disktype = disktype | TDEDiskDeviceType::UnlockedCrypt; + } + else { + disktype = disktype & ~TDEDiskDeviceType::UnlockedCrypt; + } + if (TQString(udev_device_get_property_value(dev, "UDISKS_IGNORE")) == "1") { diskstatus = diskstatus | TDEDiskDeviceStatus::Hidden; } @@ -2722,24 +2713,20 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist } } - if (removable) { + if (readLineFile( systempath + "/removable" ).toUInt()) { diskstatus = diskstatus | TDEDiskDeviceStatus::Removable; } - if (hotpluggable) { - diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; - } // Force removable flag for flash disks // udev reports disks as non-removable for card readers on PCI controllers - if (((disktype & TDEDiskDeviceType::CompactFlash) + else if ((disktype & TDEDiskDeviceType::CompactFlash) || (disktype & TDEDiskDeviceType::MemoryStick) || (disktype & TDEDiskDeviceType::SmartMedia) - || (disktype & TDEDiskDeviceType::SDMMC)) - && !(diskstatus & TDEDiskDeviceStatus::Removable) - && !(diskstatus & TDEDiskDeviceStatus::Hotpluggable)) { - diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable; + || (disktype & TDEDiskDeviceType::SDMMC)) { + diskstatus = diskstatus | TDEDiskDeviceStatus::Removable; } - if ((filesystemtype.upper() != "CRYPTO_LUKS") && (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP") && (!filesystemtype.isEmpty())) { + if ((!filesystemtype.isEmpty()) && (filesystemtype.upper() != "CRYPTO_LUKS") && + (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP")) { diskstatus = diskstatus | TDEDiskDeviceStatus::ContainsFilesystem; } else { @@ -2748,10 +2735,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist // Set mountable flag if device is likely to be mountable diskstatus = diskstatus | TDEDiskDeviceStatus::Mountable; - if ((devicetypestring.upper().isNull()) && (disktype & TDEDiskDeviceType::HDD)) { + if (devicetypestring.upper().isNull() && devicetypestring_alt.upper().isNull() && (disktype & TDEDiskDeviceType::HDD)) { + // For mapped devices, ID_TYPE may be missing, so need to check the alternative device + // type string too. For example for LUKS disk, ID_TYPE is null and DEVTYPE is "disk" diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; } - if (removable) { + if ( diskstatus & TDEDiskDeviceStatus::Removable ) { if (sdevice->mediaInserted()) { diskstatus = diskstatus | TDEDiskDeviceStatus::Inserted; } @@ -2764,11 +2753,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; } // Partition tables cannot be mounted - if ((TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")) != "") - && ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty()) - || (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5") - || (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf") - || (TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) { + if ((!TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")).isEmpty()) && + ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty() && + !(diskstatus & TDEDiskDeviceStatus::ContainsFilesystem)) || + (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5") || + (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf") || + (TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) { diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; } // If certain disk types do not report the presence of a filesystem, they are likely not mountable @@ -2777,6 +2767,11 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; } } + // Encrypted or RAID disks are not mountable + if (filesystemtype.upper() == "CRYPTO_LUKS" || filesystemtype.upper() == "CRYPTO" || + filesystemusage.upper() == "RAID") { + diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable; + } if (holdingDeviceNodes.count() > 0) { diskstatus = diskstatus | TDEDiskDeviceStatus::UsedByDevice; @@ -2787,17 +2782,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist } // See if any slaves were crypted - for ( TQStringList::Iterator slaveit = slaveDeviceNodes.begin(); slaveit != slaveDeviceNodes.end(); ++slaveit ) { - struct udev_device *slavedev; - slavedev = udev_device_new_from_syspath(m_udevStruct, (*slaveit).ascii()); - TQString slavediskfstype(udev_device_get_property_value(slavedev, "ID_FS_TYPE")); - if ((slavediskfstype.upper() == "CRYPTO_LUKS") || (slavediskfstype.upper() == "CRYPTO")) { - disktype = disktype | TDEDiskDeviceType::UnlockedCrypt; - // Set disk type based on parent device - disktype = disktype | classifyDiskType(slavedev, devicenode, TQString(udev_device_get_property_value(dev, "ID_BUS")), TQString(udev_device_get_property_value(dev, "ID_TYPE")), (*slaveit), TQString(udev_device_get_property_value(dev, "ID_VENDOR")), TQString(udev_device_get_property_value(dev, "ID_MODEL")), TQString(udev_device_get_property_value(dev, "ID_FS_TYPE")), TQString(udev_device_get_driver(dev))); - } - udev_device_unref(slavedev); - } sdevice->internalSetDiskType(disktype); sdevice->internalSetDiskUUID(diskuuid); @@ -2847,6 +2831,8 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist } sdevice->internalSetDiskLabel(disklabel); + sdevice->internalUpdateMountPath(); + sdevice->internalUpdateMappedName(); } } @@ -2944,7 +2930,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist ndevice->internalSetIpV6Netmask(address); } } - s = getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + s = ifa->ifa_ifu.ifu_broadaddr ? getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; if (s == 0) { TQString address(host); if (family == AF_INET) { @@ -2955,7 +2941,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist ndevice->internalSetIpV6Broadcast(address); } } - s = getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + s = ifa->ifa_ifu.ifu_dstaddr ? getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME; if (s == 0) { TQString address(host); if (family == AF_INET) { @@ -3648,8 +3634,6 @@ bool TDEHardwareDevices::queryHardwareInformation() { // Update parent/child tables for all devices updateParentDeviceInformation(); - emit hardwareEvent(TDEHardwareEvent::HardwareListModified, TQString()); - return true; } @@ -3759,7 +3743,7 @@ TQString TDEHardwareDevices::findPCIDeviceName(TQString vendorid, TQString model if (!pci_id_map) { pci_id_map = new TDEDeviceIDMap; - TQString database_filename = "/usr/share/pci.ids"; + TQString database_filename = "/usr/share/hwdata/pci.ids"; if (!TQFile::exists(database_filename)) { database_filename = "/usr/share/misc/pci.ids"; } @@ -3869,7 +3853,7 @@ TQString TDEHardwareDevices::findUSBDeviceName(TQString vendorid, TQString model if (!usb_id_map) { usb_id_map = new TDEDeviceIDMap; - TQString database_filename = "/usr/share/usb.ids"; + TQString database_filename = "/usr/share/hwdata/usb.ids"; if (!TQFile::exists(database_filename)) { database_filename = "/usr/share/misc/usb.ids"; } diff --git a/tdecore/tdehw/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h index 7f27681f2..ad3f30c71 100644 --- a/tdecore/tdehw/tdehardwaredevices.h +++ b/tdecore/tdehw/tdehardwaredevices.h @@ -81,7 +81,7 @@ typedef TQDict<TDECPUDevice> TDECPUDeviceCache; class TDECORE_EXPORT TDEHardwareDevices : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -207,19 +207,13 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject /** * Rescan a hardware device to look for changes * WARNING: This method can be very expensive. Use with caution! - * @param hwdevice TDEGenericDevice* with the device to rescan - */ - void rescanDeviceInformation(TDEGenericDevice* hwdevice); - - /** - * Rescan a hardware device to look for changes - * WARNING: This method can be very expensive. Use with caution! * The computational expense can be reduced somewhat if the device tree structure * has not changed by calling this method with regenerateDeviceTree = false. * @param hwdevice TDEGenericDevice* with the device to rescan + * @param dev udev_device* with the udev device to rescan * @param regenerateDeviceTree true to update parent/child links in device tree */ - void rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree); + void rescanDeviceInformation(TDEGenericDevice* hwdevice, udev_device* dev = NULL, bool regenerateDeviceTree = true); /** * Enable or disable automatic state updates of triggerless hardware devices @@ -238,7 +232,7 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject * @param enable a bool specifiying whether or not automatic updates should be enabled */ void setBatteryUpdatesEnabled(bool enable); - + /** * Convert a byte count to human readable form * @param bytes a double containing the number of bytes @@ -250,8 +244,6 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject void hardwareAdded(TDEGenericDevice*); void hardwareRemoved(TDEGenericDevice*); void hardwareUpdated(TDEGenericDevice*); - void mountTableModified(); - void hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString uuid); /** * @param keycode the code of the key that was pressed/released @@ -274,7 +266,7 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject private: TDEGenericDevice *classifyUnknownDevice(udev_device* dev, TDEGenericDevice* existingdevice=0, bool force_full_classification=true); TDEGenericDevice *classifyUnknownDeviceByExternalRules(udev_device* dev, TDEGenericDevice* existingdevice=0, bool classifySubDevices=false); - void updateExistingDeviceInformation(TDEGenericDevice* existingdevice, udev_device* dev=NULL); + void updateExistingDeviceInformation(TDEGenericDevice *device, udev_device *dev=NULL); void updateParentDeviceInformation(); void updateParentDeviceInformation(TDEGenericDevice* hwdevice); @@ -314,6 +306,7 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject TDEDeviceIDMap* dpy_id_map; TDECPUDeviceCache m_cpuByPathCache; + TQStringList m_unclassifiedDevices; friend class TDEGenericDevice; friend class TDEStorageDevice; diff --git a/tdecore/tdehw/tdehwcommontypes.h b/tdecore/tdehw/tdehwcommontypes.h index bc4eaeecf..e26de1996 100644 --- a/tdecore/tdehw/tdehwcommontypes.h +++ b/tdecore/tdehw/tdehwcommontypes.h @@ -91,16 +91,4 @@ enum TDEDisplayPowerLevel { }; }; -namespace TDEHardwareEvent { -enum TDEHardwareEvent { - HardwareListModified, - MountTableModified, - HardwareAdded, - HardwareRemoved, - HardwareUpdated, - Other, - Last = Other -}; -}; - #endif // _TDEHWCOMMON_H diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp index 2961c8737..9a273cebb 100644 --- a/tdecore/tdehw/tdenetworkconnections.cpp +++ b/tdecore/tdehw/tdenetworkconnections.cpp @@ -40,6 +40,13 @@ /* TDENetworkSearchDomain */ /*================================================================================================*/ +extern "C" { + TDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager() + { + return new TDEGlobalNetworkManager(); + } +} + TDENetworkSearchDomain::TDENetworkSearchDomain() { m_isIPV6 = false; } @@ -700,7 +707,7 @@ TDEWiFiConnection::~TDEWiFiConnection() { TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) { m_emissionTimer = new TQTimer(); - connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals())); + connect(m_emissionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitQueuedSignals())); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true); } @@ -955,9 +962,9 @@ TDEGlobalNetworkManager::TDEGlobalNetworkManager() : m_internalConnectionManager m_internalConnectionManager = new TDENetworkConnectionManager_BackendNM(NULL); #endif // WITH_NETWORK_MANAGER_BACKEND if (m_internalConnectionManager) { - connect(m_internalConnectionManager, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); - connect(m_internalConnectionManager, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); - connect(m_internalConnectionManager, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); + connect(m_internalConnectionManager, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); } } @@ -1097,9 +1104,14 @@ TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddr TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(*it); if (dev) { TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); - TDENetworkWiFiAPInfo* candidate = deviceConnMan->findAccessPointByBSSID(bssid); - if (candidate) { - ret = candidate; + if (deviceConnMan) + { + TDENetworkWiFiAPInfo* candidate = deviceConnMan->findAccessPointByBSSID(bssid); + if (candidate) + { + ret = candidate; + break; + } } } } diff --git a/tdecore/tdehw/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h index 806c162a8..aa44e8edb 100644 --- a/tdecore/tdehw/tdenetworkconnections.h +++ b/tdecore/tdehw/tdenetworkconnections.h @@ -1015,7 +1015,7 @@ class TQTimer; class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -1364,7 +1364,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject class TDECORE_EXPORT TDEGlobalNetworkManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp index 741751581..65194374d 100644 --- a/tdecore/tdehw/tderootsystemdevice.cpp +++ b/tdecore/tdehw/tderootsystemdevice.cpp @@ -28,17 +28,17 @@ #include "tdeglobal.h" #include "tdeconfig.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "config.h" -#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_HAL) || defined(WITH_CONSOLEKIT) +#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_CONSOLEKIT) #include <tqdbusdata.h> #include <tqdbusmessage.h> #include <tqdbusproxy.h> #include <tqdbusvariant.h> #include <tqdbusconnection.h> -#endif // defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_HAL) || defined(WITH_CONSOLEKIT) +#endif TDERootSystemDevice::TDERootSystemDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) { m_hibernationSpace = -1; @@ -247,32 +247,6 @@ bool TDERootSystemDevice::canSuspend() { } #endif// WITH_DEVKITPOWER -#ifdef WITH_HAL - { - TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if (dbusConn.isConnected()) { - TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn); - if (halProperties.canSend()) { - // can suspend? - TQValueList<TQT_DBusData> params; - TQT_DBusMessage reply; - params.clear(); - params << TQT_DBusData::fromString("power_management.can_suspend"); - reply = halProperties.sendWithReply("GetPropertyBoolean", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return reply[0].toBool(); - } - params.clear(); - params << TQT_DBusData::fromString("power_management.can_suspend_to_ram"); - reply = halProperties.sendWithReply("GetPropertyBoolean", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return reply[0].toBool(); - } - } - } - } -#endif // WITH_HAL - #ifdef WITH_TDEHWLIB_DAEMONS { TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); @@ -362,32 +336,6 @@ bool TDERootSystemDevice::canHibernate() { } #endif// WITH_DEVKITPOWER -#ifdef WITH_HAL - { - TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if (dbusConn.isConnected()) { - TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn); - if (halProperties.canSend()) { - // can hibernate? - TQValueList<TQT_DBusData> params; - TQT_DBusMessage reply; - params.clear(); - params << TQT_DBusData::fromString("power_management.can_hibernate"); - reply = halProperties.sendWithReply("GetPropertyBoolean", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return reply[0].toBool(); - } - params.clear(); - params << TQT_DBusData::fromString("power_management.can_suspend_to_disk"); - reply = halProperties.sendWithReply("GetPropertyBoolean", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return reply[0].toBool(); - } - } - } - } -#endif // WITH_HAL - #ifdef WITH_TDEHWLIB_DAEMONS { TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); @@ -444,26 +392,6 @@ bool TDERootSystemDevice::canHybridSuspend() { // No support "hybrid suspend" in org.freedesktop.UPower // No support "hybrid suspend" in org.freedesktop.DeviceKit.Power -#ifdef WITH_HAL - { - TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if (dbusConn.isConnected()) { - TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn); - if (halProperties.canSend()) { - // can hybrid suspend? - TQValueList<TQT_DBusData> params; - TQT_DBusMessage reply; - params.clear(); - params << TQT_DBusData::fromString("power_management.can_suspend_hybrid"); - reply = halProperties.sendWithReply("GetPropertyBoolean", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { - return reply[0].toBool(); - } - } - } - } -#endif // WITH_HAL - #ifdef WITH_TDEHWLIB_DAEMONS { TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); @@ -794,53 +722,6 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState } #endif // WITH_DEVKITPOWER -#ifdef WITH_HAL - { - // No support for "freeze" in org.freedesktop.Hal - TQT_DBusConnection dbusConn; - dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); - if ( dbusConn.isConnected() ) { - if (ps == TDESystemPowerState::Suspend) { - TQT_DBusProxy halPowerManagement( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - dbusConn); - TQValueList<TQT_DBusData> params; - params << TQT_DBusData::fromInt32(0); - TQT_DBusMessage reply = halPowerManagement.sendWithReply("Suspend", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage) { - return true; - } - } - else if (ps == TDESystemPowerState::Hibernate) { - TQT_DBusMessage msg = TQT_DBusMessage::methodCall( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - "Hibernate"); - TQT_DBusMessage reply = dbusConn.sendWithReply(msg); - if (reply.type() == TQT_DBusMessage::ReplyMessage) { - return true; - } - } - else if (ps == TDESystemPowerState::HybridSuspend) { - TQT_DBusProxy halPowerManagement( - "org.freedesktop.Hal", - "/org/freedesktop/Hal/devices/computer", - "org.freedesktop.Hal.Device.SystemPowerManagement", - dbusConn); - TQValueList<TQT_DBusData> params; - params << TQT_DBusData::fromInt32(0); - TQT_DBusMessage reply = halPowerManagement.sendWithReply("SuspendHybrid", params); - if (reply.type() == TQT_DBusMessage::ReplyMessage) { - return true; - } - } - } - } -#endif // WITH_HAL - #ifdef WITH_TDEHWLIB_DAEMONS { TQT_DBusConnection dbusConn; @@ -970,7 +851,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << (int)0 << (int)2 << (int)2; - if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { + if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { return true; } return false; @@ -1021,7 +902,7 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << (int)0 << (int)1 << (int)2; - if ( kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { + if ( tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data) ) { return true; } return false; diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index bff09e319..318768dfe 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -34,7 +34,7 @@ #include "tdeglobal.h" #include "kiconloader.h" #include "tdetempfile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdehardwaredevices.h" #include "disksHelper.h" @@ -43,11 +43,9 @@ #if defined(WITH_CRYPTSETUP) #ifdef CRYPTSETUP_OLD_API #define class cryptsetup_class - #define CRYPT_SLOT_INVALID INVALID - #define CRYPT_SLOT_INACTIVE INACTIVE - #define CRYPT_SLOT_ACTIVE ACTIVE - #define CRYPT_SLOT_BUSY BUSY - #define CRYPT_SLOT_ACTIVE_LAST ACTIVE + #define CRYPT_SLOT_INACTIVE SLOT_INACTIVE + #define CRYPT_SLOT_ACTIVE SLOT_ACTIVE + #define CRYPT_SLOT_ACTIVE_LAST SLOT_ACTIVE_LAST #include <libcryptsetup.h> #undef class #else @@ -55,7 +53,7 @@ #endif #endif -TDEStorageDevice::TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), m_mediaInserted(true), m_cryptDevice(NULL) { +TDEStorageDevice::TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), m_mediaInserted(true), m_cryptDevice(NULL), m_cryptKeySlotCount(0) { m_diskType = TDEDiskDeviceType::Null; m_diskStatus = TDEDiskDeviceStatus::Null; } @@ -69,6 +67,26 @@ TDEStorageDevice::~TDEStorageDevice() { #endif } +TQString TDEStorageDevice::mappedName() { + return m_mappedName; +} + +void TDEStorageDevice::internalUpdateMappedName() { + // Get the device mapped name if present + m_mappedName = TQString::null; + TQString dmnodename = systemPath(); + dmnodename.append("/dm/name"); + TQFile dmnamefile(dmnodename); + if (dmnamefile.open(IO_ReadOnly)) { + TQTextStream stream(&dmnamefile); + m_mappedName = stream.readLine(); + dmnamefile.close(); + } + if (!m_mappedName.isEmpty()) { + m_mappedName.prepend("/dev/mapper/"); + } +} + TDEDiskDeviceType::TDEDiskDeviceType TDEStorageDevice::diskType() { return m_diskType; } @@ -266,8 +284,8 @@ TQString TDEStorageDevice::cryptKeySlotFriendlyName(TDELUKSKeySlotStatus::TDELUK } } -void TDEStorageDevice::internalSetDeviceNode(TQString sn) { - TDEGenericDevice::internalSetDeviceNode(sn); +void TDEStorageDevice::internalSetDeviceNode(TQString dn) { + TDEGenericDevice::internalSetDeviceNode(dn); internalInitializeLUKSIfNeeded(); } @@ -307,28 +325,40 @@ bool TDEStorageDevice::lockDriveMedia(bool lock) { } } -bool TDEStorageDevice::ejectDrive() { +TQStringVariantMap TDEStorageDevice::ejectDrive() { + TQStringVariantMap result; + TQStringVariantMap ejectResult; + + // If the device is mounted, try unmounting it first + if (!mountPath().isEmpty()) { + unmountDevice(); + } + #ifdef WITH_UDISKS2 if (!(TDEGlobal::dirs()->findExe("udisksctl").isEmpty())) { - TQStringVariantMap ejectResult = UDisks2EjectDrive(this); + ejectResult = udisks2EjectDrive(this); if (ejectResult["result"].toBool()) { - return true; + result["result"] = true; + return result; } else { - printf("[tdehwlib] Failed to eject drive '%s' via udisks2, falling back to alternate mechanism\n", deviceNode().ascii()); - fflush(stdout); + result["errStr"] = ejectResult["errStr"]; + result["result"] = false; + return result; } } #endif #ifdef WITH_UDISKS if (!(TDEGlobal::dirs()->findExe("udisks").isEmpty())) { - TQStringVariantMap ejectResult = UDisksEjectDrive(this); + ejectResult = udisksEjectDrive(this); if (ejectResult["result"].toBool()) { - return true; + result["result"] = true; + return result; } else { - printf("[tdehwlib] Failed to eject drive '%s' via udisks, falling back to alternate mechanism\n", deviceNode().ascii()); - fflush(stdout); + result["errStr"] = ejectResult["errStr"]; + result["result"] = false; + return result; } } #endif @@ -343,14 +373,18 @@ bool TDEStorageDevice::ejectDrive() { eject_output = ts.read(); int retcode = pclose(exepipe); if (retcode == 0) { - return true; + result["result"] = true; + return result; + } + else { + result["errStr"] = eject_output; + result["retCode"] = retcode; } } - printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n", deviceNode().ascii()); - fflush(stdout); } - return false; + result["result"] = false; + return result; } bool TDEStorageDevice::ejectDriveMedia() { @@ -470,7 +504,7 @@ TQString TDEStorageDevice::friendlyName() { TQString label = diskLabel(); if (label.isNull()) { if (deviceSize() > 0) { - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { label = i18n("%1 Removable Device").arg(deviceFriendlySize()); } else { @@ -527,7 +561,7 @@ TQString TDEStorageDevice::friendlyDeviceType() { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = i18n("Hard Disk Drive"); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = i18n("Removable Storage"); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { @@ -598,7 +632,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = DesktopIcon("drive-harddisk" + mountString, size); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = DesktopIcon("media-flash-usb" + mountString, size); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { @@ -648,7 +682,13 @@ TQString TDEStorageDevice::deviceFriendlySize() { return TDEHardwareDevices::bytesToFriendlySizeString(deviceSize()); } -TQString TDEStorageDevice::mountPath() { +TQString TDEStorageDevice::mountPath() +{ + return m_mountPath; +} + +void TDEStorageDevice::internalUpdateMountPath() +{ // See if this device node is mounted // This requires parsing /proc/mounts, looking for deviceNode() @@ -656,21 +696,10 @@ TQString TDEStorageDevice::mountPath() { // It likes to advertise mounts as /dev/mapper/<something>, // where <something> is listed in <system path>/dm/name - // First, ensure that all device information (mainly holders/slaves) is accurate - TDEGlobal::hardwareDevices()->rescanDeviceInformation(this); + // Assumed all device information (mainly holders/slaves) is accurate + // prior to the call - TQString dmnodename = systemPath(); - dmnodename.append("/dm/name"); - TQFile namefile( dmnodename ); - TQString dmaltname; - if ( namefile.open( IO_ReadOnly ) ) { - TQTextStream stream( &namefile ); - dmaltname = stream.readLine(); - namefile.close(); - } - if (!dmaltname.isNull()) { - dmaltname.prepend("/dev/mapper/"); - } + m_mountPath = TQString::null; TQStringList lines; TQFile file( "/proc/mounts" ); @@ -682,30 +711,16 @@ TQString TDEStorageDevice::mountPath() { TQStringList mountInfo = TQStringList::split(" ", line, true); TQString testNode = *mountInfo.at(0); // Check for match - if ((testNode == deviceNode()) || (testNode == dmaltname) || (testNode == ("/dev/disk/by-uuid/" + diskUUID()))) { - TQString ret = *mountInfo.at(1); - ret.replace("\\040", " "); - return ret; + if ((testNode == deviceNode()) || (testNode == mappedName()) || (testNode == ("/dev/disk/by-uuid/" + diskUUID()))) { + m_mountPath = *mountInfo.at(1); + m_mountPath.replace("\\040", " "); + file.close(); + return; } lines += line; } file.close(); } - - // While this device is not directly mounted, it could concievably be mounted via the Device Mapper - // If so, try to retrieve the mount path... - TQStringList slaveDeviceList = holdingDevices(); - for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) { - // Try to locate this device path in the TDE device tree - TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - TDEGenericDevice *hwdevice = hwdevices->findBySystemPath(*slavedevit); - if ((hwdevice) && (hwdevice->type() == TDEGenericDeviceType::Disk)) { - TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); - return sdevice->mountPath(); - } - } - - return TQString::null; } TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOptions mountOptions) { @@ -786,7 +801,7 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM #if defined(WITH_UDISKS2) // Try to use UDISKS v2 via DBUS, if available - mountResult = UDisks2MountDrive(devNode, fileSystemType, optionString); + mountResult = udisks2MountDrive(devNode, fileSystemType, optionString); if (mountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); @@ -806,7 +821,7 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM #if defined(WITH_UDISKS) // The UDISKS v2 DBUS service was either not available or was unusable // Try to use UDISKS v1 via DBUS, if available - mountResult = UDisksMountDrive(devNode, fileSystemType, udisksOptions); + mountResult = udisksMountDrive(devNode, fileSystemType, udisksOptions); if (mountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); @@ -847,10 +862,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM // If no other method was found, use 'pmount' command if available if(command.isEmpty()) { if (!TDEGlobal::dirs()->findExe("pmount").isEmpty()) { - // Create dummy password file - KTempFile passwordFile(TQString::null, "tmp", 0600); - passwordFile.setAutoDelete(true); - TQString optionString; if (mountOptions["ro"] == "true") { optionString.append(" -r"); @@ -886,11 +897,9 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM mountpoint = mediaName; } - TQString passFileName = passwordFile.name(); - passFileName.replace("'", "'\\''"); - - command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1") - .arg(passFileName).arg(optionString).arg(devNode).arg(mountpoint); + // %1 (option string) without quotes, otherwise pmount fails + command = TQString("pmount %1 '%2' '%3' 2>&1") + .arg(optionString).arg(devNode).arg(mountpoint); } } @@ -917,99 +926,24 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM return result; } -TQStringVariantMap TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString mediaName, - TDEStorageMountOptions mountOptions) { - TQStringVariantMap result; - - // Check if device is already mounted - TQString mountpath = mountPath(); - if (!mountpath.isEmpty()) { - result["mountPath"] = mountpath; - result["result"] = true; - return result; - } - - // Create dummy password file - KTempFile passwordFile(TQString::null, "tmp", 0600); - passwordFile.setAutoDelete(true); - TQFile* pwFile = passwordFile.file(); - if (!pwFile) { - result["errStr"] = i18n("Cannot create temporary password file"); - result["result"] = false; - return result; - } - - pwFile->writeBlock(passphrase.ascii(), passphrase.length()); - pwFile->flush(); - - TQString optionString; - if (mountOptions["ro"] == "true") { - optionString.append(" -r"); - } - - if (mountOptions["atime"] != "true") { - optionString.append(" -A"); - } - - if (mountOptions["utf8"] == "true") { - optionString.append(" -c utf8"); - } - - if (mountOptions["sync"] == "true") { - optionString.append(" -s"); - } - - if (mountOptions.contains("filesystem") && !mountOptions["filesystem"].isEmpty()) { - optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); - } - - if (mountOptions.contains("locale")) { - optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); - } - - TQString passFileName = passwordFile.name(); - TQString devNode = deviceNode(); - passFileName.replace("'", "'\\''"); - devNode.replace("'", "'\\''"); - mediaName.replace("'", "'\\''"); - TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1") - .arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); - - FILE *exepipe = popen(command.local8Bit(), "r"); - if (exepipe) { - TQTextStream* ts = new TQTextStream(exepipe, IO_ReadOnly); - TQString mount_output = ts->read(); - delete ts; - int retcode = pclose(exepipe); - result["errStr"] = mount_output; - result["retCode"] = retcode; - } - - // Update internal mount data - TDEGlobal::hardwareDevices()->processModifiedMounts(); - result["mountPath"] = mountPath(); - result["result"] = !mountPath().isEmpty(); - return result; -} - TQStringVariantMap TDEStorageDevice::unmountDevice() { TQStringVariantMap result; // Check if device is already unmounted - TQString mountpoint = mountPath(); - if (mountpoint.isEmpty()) { + TQString mountpath = mountPath(); + if (mountpath.isEmpty()) { result["result"] = true; return result; } - mountpoint.replace("'", "'\\''"); + mountpath.replace("'", "'\\''"); TQString devNode = deviceNode(); TQString command = TQString::null; TQStringVariantMap unmountResult; #if defined(WITH_UDISKS2) // Try to use UDISKS v2 via DBUS, if available - unmountResult = UDisks2UnmountDrive(devNode, TQString::null); + unmountResult = udisks2UnmountDrive(devNode, TQString::null); if (unmountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); @@ -1028,7 +962,7 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() { #if defined(WITH_UDISKS) // The UDISKS v2 DBUS service was either not available or was unusable // Try to use UDISKS v1 via DBUS, if available - unmountResult = UDisksUnmountDrive(devNode, TQStringList()); + unmountResult = udisksUnmountDrive(devNode, TQStringList()); if (unmountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); @@ -1048,13 +982,13 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() { // The UDISKS v1 DBUS service was either not available or was unusable // Use 'udevil' command, if available if (!TDEGlobal::dirs()->findExe("udevil").isEmpty()) { - command = TQString("udevil umount '%1' 2>&1").arg(mountpoint); + command = TQString("udevil umount '%1' 2>&1").arg(mountpath); } #endif // If no other method was found, use 'pmount' command if available if(command.isEmpty() && !TDEGlobal::dirs()->findExe("pumount").isEmpty()) { - command = TQString("pumount '%1' 2>&1").arg(mountpoint); + command = TQString("pumount '%1' 2>&1").arg(mountpath); } if(command.isEmpty()) { @@ -1087,57 +1021,119 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() { return result; } -TQString TDEStorageDevice::determineFileSystemType(TQString path) { - TQStringList mountTable; - TQString prevPath = path; - dev_t prevDev = 0; - int pos; - struct stat directory_info; - if (path.startsWith("/")) { - stat(path.local8Bit(), &directory_info); - prevDev = directory_info.st_dev; - // Walk the directory tree up to the root, checking for any change in st_dev - // If a change is found, the previous value of path is the mount point itself - while (path != "/") { - pos = path.findRev("/", -1, true); - if (pos < 0) { - break; - } - path = path.mid(0, pos); - if (path == "") { - path = "/"; +TQStringVariantMap TDEStorageDevice::unlockDevice(const TQString &passphrase) +{ + TQStringVariantMap result; + + TQString devNode = deviceNode(); + devNode.replace("'", "'\\''"); + + TQStringVariantMap unlockResult; + +#if defined(WITH_UDISKS2) + // Try to use UDISKS v2 via DBUS, if available + unlockResult = udisks2UnlockDrive(devNode, passphrase); + if (unlockResult["result"].toBool()) { + result["unlockedDevice"] = unlockResult["unlockedDevice"]; + result["result"] = true; + return result; + } + else if (unlockResult["retcode"].toInt() == -1) { + result["errStr"] = unlockResult["errStr"]; + result["result"] = false; + return result; + } +#endif + + // If no other method was found, use 'pmount' command if available + if (!TDEGlobal::dirs()->findExe("pmount").isEmpty()) { + // Create dummy password file + KTempFile passwordFile(TQString::null, "tmp", 0600); + passwordFile.setAutoDelete(true); + TQFile *pwFile = passwordFile.file(); + if (!pwFile) { + result["errStr"] = i18n("Cannot create temporary password file"); + result["result"] = false; + return result; + } + pwFile->writeBlock(passphrase.local8Bit(), passphrase.length()); + pwFile->flush(); + TQString passFileName = passwordFile.name(); + passFileName.replace("'", "'\\''"); + + TQString command = TQString("pmount -p '%1' '%2'").arg(passFileName).arg(devNode); + FILE *exepipe = popen(command.local8Bit(), "r"); + if (exepipe) { + TQTextStream* ts = new TQTextStream(exepipe, IO_ReadOnly); + TQString unlock_output = ts->read(); + delete ts; + int retcode = pclose(exepipe); + if (retcode == 0) { + result["result"] = true; } - stat(path.local8Bit(), &directory_info); - if (directory_info.st_dev != prevDev) { - break; + else { + result["errStr"] = unlock_output; + result["retCode"] = retcode; + result["result"] = false; } - prevPath = path; - prevDev = directory_info.st_dev; + return result; } } - // Read in mount table - mountTable.clear(); - TQFile file( "/proc/mounts" ); - if ( file.open( IO_ReadOnly ) ) { - TQTextStream stream( &file ); - while ( !stream.atEnd() ) { - mountTable.append(stream.readLine()); - } - file.close(); + // No supported methods found for unlocking the device + result["errStr"] = i18n("No supported unlocking methods were detected on your system."); + result["result"] = false; + return result; +} + +TQStringVariantMap TDEStorageDevice::lockDevice() +{ + TQStringVariantMap result; + + TQString devNode = deviceNode(); + devNode.replace("'", "'\\''"); + + TQStringVariantMap lockResult; + +#if defined(WITH_UDISKS2) + // Try to use UDISKS v2 via DBUS, if available + lockResult = udisks2LockDrive(devNode); + if (lockResult["result"].toBool()) { + result["result"] = true; + return result; } + else if (lockResult["retcode"].toInt() == -1) { + result["errStr"] = lockResult["errStr"]; + result["result"] = false; + return result; + } +#endif - // Parse mount table - TQStringList::Iterator it; - for ( it = mountTable.begin(); it != mountTable.end(); ++it ) { - TQStringList mountInfo = TQStringList::split(" ", (*it), true); - if ((*mountInfo.at(1)) == prevPath) { - return (*mountInfo.at(2)); + // If no other method was found, use 'pumount' command if available + if (!TDEGlobal::dirs()->findExe("pumount").isEmpty()) { + TQString command = TQString("pumount '%1'").arg(devNode); + FILE *exepipe = popen(command.local8Bit(), "r"); + if (exepipe) { + TQTextStream* ts = new TQTextStream(exepipe, IO_ReadOnly); + TQString lock_output = ts->read(); + delete ts; + int retcode = pclose(exepipe); + if (retcode == 0) { + result["result"] = true; + } + else { + result["errStr"] = lock_output; + result["retCode"] = retcode; + result["result"] = false; + } + return result; } } - // Unknown file system type - return TQString::null; + // No supported methods found for locking the device + result["errStr"] = i18n("No supported locking methods were detected on your system."); + result["result"] = false; + return result; } #include "tdestoragedevice.moc" diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index 6bd39353b..88a387377 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -22,63 +22,60 @@ #include "tdegenericdevice.h" #include "tqvariant.h" +#include "tdemacros.h" struct crypt_device; // Keep readDiskDeviceSubtypeFromString() in tdehardwaredevices.cpp in sync with this enum namespace TDEDiskDeviceType { -#if __cplusplus >= 201103L enum TDEDiskDeviceType : unsigned long long { -#else -enum TDEDiskDeviceType { -#endif - Null = 0x0000000000000000ULL, - MediaDevice = 0x0000000000000001ULL, - Floppy = 0x0000000000000002ULL, - CDROM = 0x0000000000000004ULL, - CDR = 0x0000000000000008ULL, - CDRW = 0x0000000000000010ULL, - CDMO = 0x0000000000000020ULL, - CDMRRW = 0x0000000000000040ULL, - CDMRRWW = 0x0000000000000080ULL, - DVDROM = 0x0000000000000100ULL, - DVDRAM = 0x0000000000000200ULL, - DVDR = 0x0000000000000400ULL, - DVDRW = 0x0000000000000800ULL, - DVDRDL = 0x0000000000001000ULL, - DVDRWDL = 0x0000000000002000ULL, - DVDPLUSR = 0x0000000000004000ULL, - DVDPLUSRW = 0x0000000000008000ULL, - DVDPLUSRDL = 0x0000000000010000ULL, - DVDPLUSRWDL = 0x0000000000020000ULL, - BDROM = 0x0000000000040000ULL, - BDR = 0x0000000000080000ULL, - BDRW = 0x0000000000100000ULL, - HDDVDROM = 0x0000000000200000ULL, - HDDVDR = 0x0000000000400000ULL, - HDDVDRW = 0x0000000000800000ULL, - Zip = 0x0000000001000000ULL, - Jaz = 0x0000000002000000ULL, - Camera = 0x0000000004000000ULL, - LUKS = 0x0000000008000000ULL, - OtherCrypted = 0x0000000010000000ULL, - CDAudio = 0x0000000020000000ULL, - CDVideo = 0x0000000040000000ULL, - DVDVideo = 0x0000000080000000ULL, - BDVideo = 0x0000000100000000ULL, - Flash = 0x0000000200000000ULL, - USB = 0x0000000400000000ULL, - Tape = 0x0000000800000000ULL, - HDD = 0x0000001000000000ULL, - Optical = 0x0000002000000000ULL, - RAM = 0x0000004000000000ULL, - Loop = 0x0000008000000000ULL, - CompactFlash = 0x0000010000000000ULL, - MemoryStick = 0x0000020000000000ULL, - SmartMedia = 0x0000040000000000ULL, - SDMMC = 0x0000080000000000ULL, - UnlockedCrypt = 0x0000100000000000ULL, - Other = 0x8000000000000000ULL + Null = 0x0000000000000000ULL, + MediaDevice = 0x0000000000000001ULL, + Floppy = 0x0000000000000002ULL, + CDROM = 0x0000000000000004ULL, + CDR = 0x0000000000000008ULL, + CDRW = 0x0000000000000010ULL, + CDMO = 0x0000000000000020ULL, + CDMRRW = 0x0000000000000040ULL, + CDMRRWW = 0x0000000000000080ULL, + DVDROM = 0x0000000000000100ULL, + DVDRAM = 0x0000000000000200ULL, + DVDR = 0x0000000000000400ULL, + DVDRW = 0x0000000000000800ULL, + DVDRDL = 0x0000000000001000ULL, + DVDRWDL = 0x0000000000002000ULL, + DVDPLUSR = 0x0000000000004000ULL, + DVDPLUSRW = 0x0000000000008000ULL, + DVDPLUSRDL = 0x0000000000010000ULL, + DVDPLUSRWDL = 0x0000000000020000ULL, + BDROM = 0x0000000000040000ULL, + BDR = 0x0000000000080000ULL, + BDRW = 0x0000000000100000ULL, + HDDVDROM = 0x0000000000200000ULL, + HDDVDR = 0x0000000000400000ULL, + HDDVDRW = 0x0000000000800000ULL, + Zip = 0x0000000001000000ULL, + Jaz = 0x0000000002000000ULL, + Camera = 0x0000000004000000ULL, + LUKS = 0x0000000008000000ULL, + OtherCrypted = 0x0000000010000000ULL, + CDAudio = 0x0000000020000000ULL, + CDVideo = 0x0000000040000000ULL, + DVDVideo = 0x0000000080000000ULL, + BDVideo = 0x0000000100000000ULL, + Flash = 0x0000000200000000ULL, + USB = 0x0000000400000000ULL, + Tape = 0x0000000800000000ULL, + HDD = 0x0000001000000000ULL, + Optical = 0x0000002000000000ULL, + RAM = 0x0000004000000000ULL, + Loop = 0x0000008000000000ULL, + CompactFlash = 0x0000010000000000ULL, + MemoryStick = 0x0000020000000000ULL, + SmartMedia = 0x0000040000000000ULL, + SDMMC = 0x0000080000000000ULL, + UnlockedCrypt = 0x0000100000000000ULL, + Other = 0x8000000000000000ULL }; inline TDEDiskDeviceType operator|(TDEDiskDeviceType a, TDEDiskDeviceType b) @@ -99,17 +96,17 @@ inline TDEDiskDeviceType operator~(TDEDiskDeviceType a) namespace TDEDiskDeviceStatus { enum TDEDiskDeviceStatus { - Null = 0x00000000, - Mountable = 0x00000001, - Removable = 0x00000002, - Inserted = 0x00000004, - Blank = 0x00000008, - UsedByDevice = 0x00000010, - UsesDevice = 0x00000020, - ContainsFilesystem = 0x00000040, - Hotpluggable = 0x00000080, - Hidden = 0x00000100, - Other = 0x80000000 + Null = 0x00000000, + Mountable = 0x00000001, + Removable = 0x00000002, + Inserted = 0x00000004, + Blank = 0x00000008, + UsedByDevice = 0x00000010, + UsesDevice = 0x00000020, + ContainsFilesystem = 0x00000040, + // Do not use 0x00000080, it was `Hotpluggable` up to the R14.1.x series + Hidden = 0x00000100, + Other = 0x80000000 }; inline TDEDiskDeviceStatus operator|(TDEDiskDeviceStatus a, TDEDiskDeviceStatus b) @@ -130,11 +127,11 @@ inline TDEDiskDeviceStatus operator~(TDEDiskDeviceStatus a) namespace TDELUKSKeySlotStatus { enum TDELUKSKeySlotStatus { - Invalid = 0x00000000, - Inactive = 0x00000001, - Active = 0x00000002, - Last = 0x00000004, - Other = 0x80000000 + Invalid = 0x00000000, + Inactive = 0x00000001, + Active = 0x00000002, + Last = 0x00000004, + Other = 0x80000000 }; inline TDELUKSKeySlotStatus operator|(TDELUKSKeySlotStatus a, TDELUKSKeySlotStatus b) @@ -157,13 +154,13 @@ typedef TQValueList<TDELUKSKeySlotStatus::TDELUKSKeySlotStatus> TDELUKSKeySlotSt namespace TDELUKSResult { enum TDELUKSResult { - Invalid = 0x00000000, - Success = 0x00000001, - LUKSNotSupported = 0x00000002, - LUKSNotFound = 0x00000003, - InvalidKeyslot = 0x00000004, - KeyslotOpFailed = 0x00000005, - Other = 0x80000000 + Invalid = 0x00000000, + Success = 0x00000001, + LUKSNotSupported = 0x00000002, + LUKSNotFound = 0x00000003, + InvalidKeyslot = 0x00000004, + KeyslotOpFailed = 0x00000005, + Other = 0x80000000 }; }; @@ -194,6 +191,11 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice TQString diskUUID(); /** + * @return a TQString with the device mapped name, if any + */ + TQString mappedName(); + + /** * @return an OR-ed combination of TDEDiskDeviceType::TDEDiskDeviceType type flags */ TDEDiskDeviceType::TDEDiskDeviceType diskType(); @@ -240,23 +242,27 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice TDEStorageMountOptions mountOptions = TDEStorageMountOptions()); /** - * Mounts the encrypted device if the correct passphrase is given + * Unmounts the device + * + * @return a TQStringVariantMap object containing information about the operation outcome + */ + TQStringVariantMap unmountDevice(); + + /** + * Unlock/decrypt an encrypted storage device * * @param a TQString containing the passphrase - * @param a TQString containing a requested mount name under /media, if desired - * @param a TDEStorageMountOptions containing any mount options for pmount, if desired * * @return a TQStringVariantMap object containing information about the operation outcome */ - TQStringVariantMap mountEncryptedDevice(TQString passphrase, TQString mediaName = TQString::null, - TDEStorageMountOptions mountOptions = TDEStorageMountOptions()); + TQStringVariantMap unlockDevice(const TQString &passphrase); /** - * Unmounts the device + * Lock/encrypt an encrypted storage device * * @return a TQStringVariantMap object containing information about the operation outcome */ - TQStringVariantMap unmountDevice(); + TQStringVariantMap lockDevice(); /** * @return a TQString with the mount path, if mounted @@ -333,14 +339,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * This method currently works on all removable storage devices */ - bool ejectDrive(); - - /** - * @param path Full path to arbitrary file or directory - * @return TQString with type of file system containing the given file, - * or TQString::null if file system type unknown - */ - static TQString determineFileSystemType(TQString path); + TQStringVariantMap ejectDrive(); /** * Set the unlock password to use in subsequent LUKS operations @@ -421,7 +420,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * This method is non-portable, so be careful! */ - void internalSetDeviceNode(TQString sn); + void internalSetDeviceNode(TQString dn); /** * @param a TQString with the disk or partition label, if any @@ -487,7 +486,18 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice */ void internalGetLUKSKeySlotStatus(); + /** + * Find and store the alternative mapped name of a mapped device + */ + void internalUpdateMappedName(); + + /** + * Find and store the mount point of the device, if any + */ + void internalUpdateMountPath(); + private: + TQString m_mappedName; // Alternative name for a mapped device TDEDiskDeviceType::TDEDiskDeviceType m_diskType; TDEDiskDeviceStatus::TDEDiskDeviceStatus m_diskStatus; TQString m_diskName; diff --git a/tdecore/kinstance.cpp b/tdecore/tdeinstance.cpp index cbdf86783..c8235e45e 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/tdeinstance.cpp @@ -15,7 +15,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kinstance.h" +#include "tdeinstance.h" #include <stdlib.h> #include <unistd.h> @@ -25,11 +25,13 @@ #include "kcharsets.h" #include "kiconloader.h" #ifdef __TDE_HAVE_TDEHWLIB +#include "klibloader.h" +#include "tdeversion.h" #include "tdehardwaredevices.h" #include "tdenetworkconnections.h" #endif #include "tdeaboutdata.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kdebug.h" #include "tdeglobal.h" #include "kmimesourcefactory.h" @@ -44,7 +46,7 @@ static TQPtrDict<TQCString> *allOldInstances = 0; #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<TDEInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false); #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false); - #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false); + #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED TDEINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false); #else #define DEBUG_ADD #define DEBUG_REMOVE @@ -285,22 +287,42 @@ TDEIconLoader *TDEInstance::iconLoader() const #ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices *TDEInstance::hardwareDevices() const { - DEBUG_CHECK_ALIVE - if( _hardwaredevices == 0 ) { - _hardwaredevices = new TDEHardwareDevices( ); - } + DEBUG_CHECK_ALIVE + if (_hardwaredevices == 0) + { + TQString libName = TQString("libtdehw.so.%1").arg(TDE_VERSION_MAJOR); + KLibrary *lib = KLibLoader::self()->library(libName.latin1()); + if (lib) + { + TDEHardwareDevices* (*create)() = (TDEHardwareDevices* (*)())lib->symbol("create_tdeHardwareDevices"); + if (create) + { + _hardwaredevices = create(); + } + } + } - return _hardwaredevices; + return _hardwaredevices; } TDEGlobalNetworkManager *TDEInstance::networkManager() const { - DEBUG_CHECK_ALIVE - if( _networkmanager == 0 ) { - _networkmanager = new TDEGlobalNetworkManager( ); - } + DEBUG_CHECK_ALIVE + if (_networkmanager == 0) + { + TQString libName = TQString("libtdehw.so.%1").arg(TDE_VERSION_MAJOR); + KLibrary *lib = KLibLoader::self()->library(libName.latin1()); + if (lib) + { + TDEGlobalNetworkManager* (*create)() = (TDEGlobalNetworkManager* (*)())lib->symbol("create_tdeGlobalNetworkManager"); + if (create) + { + _networkmanager = create(); + } + } + } - return _networkmanager; + return _networkmanager; } #endif diff --git a/tdecore/kinstance.h b/tdecore/tdeinstance.h index e0fdf73de..7ded51878 100644 --- a/tdecore/kinstance.h +++ b/tdecore/tdeinstance.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1999 Torben Weis <weis@kde.org> This library is free software; you can redistribute it and/or @@ -15,8 +15,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KINSTANCE_H -#define _KINSTANCE_H +#ifndef _TDEINSTANCE_H +#define _TDEINSTANCE_H #include <tqstring.h> #include "tdelibs_export.h" @@ -37,8 +37,8 @@ class TDEGlobalNetworkManager; /** - * Access to KDE global objects for use in shared libraries. In - * practical terms, this class is used in KDE components. This allows + * Access to TDE global objects for use in shared libraries. In + * practical terms, this class is used in TDE components. This allows * components to store things that normally would be accessed by * TDEGlobal. * @@ -101,8 +101,8 @@ class TDECORE_EXPORT TDEInstance /** * Set a read-only flag on the configuration files * This must be called before config() or dirs() to have any effect - * Defaults to FALSE - * @param ro read only if TRUE + * Defaults to false + * @param ro read only if true */ void setConfigReadOnly(bool ro); diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 7d2ab7db2..78f129f89 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -20,42 +20,42 @@ #ifndef _TDELIBS_EXPORT_H #define _TDELIBS_EXPORT_H -/* needed for KDE_EXPORT macros */ -#include <kdemacros.h> +/* needed for TDE_EXPORT macros */ +#include <tdemacros.h> /* needed, because e.g. Q_OS_UNIX is so frequently used */ #include <tqglobal.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <tdelibs_export_win.h> #else /* Q_OS_UNIX */ /* export statements for unix */ -#define TDECORE_EXPORT KDE_EXPORT -#define TDEUI_EXPORT KDE_EXPORT -#define TDEFX_EXPORT KDE_EXPORT -#define TDEPRINT_EXPORT KDE_EXPORT -#define TDEDNSSD_EXPORT KDE_EXPORT -#define TDEIO_EXPORT KDE_EXPORT -#define DCOP_EXPORT KDE_EXPORT -#define TDEPARTS_EXPORT KDE_EXPORT -#define KTEXTEDITOR_EXPORT KDE_EXPORT -#define KABC_EXPORT KDE_EXPORT -#define TDESU_EXPORT KDE_EXPORT -#define KVCARD_EXPORT KDE_EXPORT -#define TDERESOURCES_EXPORT KDE_EXPORT -#define TDESTYLE_EXPORT KDE_EXPORT -#define TDEHTML_EXPORT KDE_EXPORT -#define KMDI_EXPORT KDE_EXPORT -#define TDEUTILS_EXPORT KDE_EXPORT -#define KATEPARTINTERFACES_EXPORT KDE_EXPORT -#define KATEPART_EXPORT KDE_EXPORT -#define KMID_EXPORT KDE_EXPORT -#define TDERANDR_EXPORT KDE_EXPORT -#define TDEIMPROXY_EXPORT KDE_EXPORT -#define KDE_ARTS_EXPORT KDE_EXPORT -#define TDEUNITTEST_EXPORT KDE_EXPORT +#define TDECORE_EXPORT TDE_EXPORT +#define TDEUI_EXPORT TDE_EXPORT +#define TDEFX_EXPORT TDE_EXPORT +#define TDEPRINT_EXPORT TDE_EXPORT +#define TDEDNSSD_EXPORT TDE_EXPORT +#define TDEIO_EXPORT TDE_EXPORT +#define DCOP_EXPORT TDE_EXPORT +#define TDEPARTS_EXPORT TDE_EXPORT +#define KTEXTEDITOR_EXPORT TDE_EXPORT +#define KABC_EXPORT TDE_EXPORT +#define TDESU_EXPORT TDE_EXPORT +#define KVCARD_EXPORT TDE_EXPORT +#define TDERESOURCES_EXPORT TDE_EXPORT +#define TDESTYLE_EXPORT TDE_EXPORT +#define TDEHTML_EXPORT TDE_EXPORT +#define KMDI_EXPORT TDE_EXPORT +#define TDEUTILS_EXPORT TDE_EXPORT +#define KATEPARTINTERFACES_EXPORT TDE_EXPORT +#define KATEPART_EXPORT TDE_EXPORT +#define KMID_EXPORT TDE_EXPORT +#define TDERANDR_EXPORT TDE_EXPORT +#define TDEIMPROXY_EXPORT TDE_EXPORT +#define KDE_ARTS_EXPORT TDE_EXPORT +#define TDEUNITTEST_EXPORT TDE_EXPORT #define KPATH_SEPARATOR ':' @@ -69,18 +69,18 @@ /* workaround for tdecore: stupid moc's grammar doesn't accept two macros between 'class' keyword and <classname>: */ -#ifdef KDE_DEPRECATED +#ifdef TDE_DEPRECATED # ifndef TDECORE_EXPORT_DEPRECATED -# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT +# define TDECORE_EXPORT_DEPRECATED TDE_DEPRECATED TDECORE_EXPORT # endif # ifndef TDEIO_EXPORT_DEPRECATED -# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT +# define TDEIO_EXPORT_DEPRECATED TDE_DEPRECATED TDEIO_EXPORT # endif # ifndef TDEUI_EXPORT_DEPRECATED -# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT +# define TDEUI_EXPORT_DEPRECATED TDE_DEPRECATED TDEUI_EXPORT # endif # ifndef KABC_EXPORT_DEPRECATED -# define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT +# define KABC_EXPORT_DEPRECATED TDE_DEPRECATED KABC_EXPORT # endif #endif /* (let's add KDE****_EXPORT_DEPRECATED for other libraries if it's needed) */ diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp index 2229418a1..1e771c85a 100644 --- a/tdecore/tdelocale.cpp +++ b/tdecore/tdelocale.cpp @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* This file is part of the KDE libraries Copyright (c) 1997,2001 Stephan Kulow <coolo@kde.org> Copyright (c) 1999 Preston Brown <pbrown@kde.org> @@ -34,16 +33,16 @@ #include "kcatalogue.h" #include "tdeglobal.h" -#include "kstandarddirs.h" -#include "ksimpleconfig.h" -#include "kinstance.h" +#include "tdestandarddirs.h" +#include "tdesimpleconfig.h" +#include "tdeinstance.h" #include "tdeconfig.h" #include "kdebug.h" #include "kcalendarsystem.h" #include "kcalendarsystemfactory.h" #include "tdelocale.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include <windows.h> #endif @@ -73,7 +72,7 @@ public: KCalendarSystem * calendar; bool utf8FileEncoding; TQString appName; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN char win32SystemEncoding[3+7]; //"cp " + lang ID #endif bool useMainCatalogue; @@ -311,7 +310,7 @@ void TDELocale::initFormat() TDEConfigGroupSaver saver(config, "Locale"); - KSimpleConfig entry(locate("locale", + TDESimpleConfig entry(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_country)), true); entry.setGroup("KCM Locale"); @@ -371,7 +370,7 @@ void TDELocale::initFormat() //Grammatical //Precedence here is l10n / i18n / config file - KSimpleConfig language(locate("locale", + TDESimpleConfig language(locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(m_language)), true); language.setGroup("KCM Locale"); @@ -1219,34 +1218,34 @@ static void _inc_by_one(TQString &str, int position) switch(last_char) { case '0': - str[i] = (QChar)'1'; + str[i] = (TQChar)'1'; break; case '1': - str[i] = (QChar)'2'; + str[i] = (TQChar)'2'; break; case '2': - str[i] = (QChar)'3'; + str[i] = (TQChar)'3'; break; case '3': - str[i] = (QChar)'4'; + str[i] = (TQChar)'4'; break; case '4': - str[i] = (QChar)'5'; + str[i] = (TQChar)'5'; break; case '5': - str[i] = (QChar)'6'; + str[i] = (TQChar)'6'; break; case '6': - str[i] = (QChar)'7'; + str[i] = (TQChar)'7'; break; case '7': - str[i] = (QChar)'8'; + str[i] = (TQChar)'8'; break; case '8': - str[i] = (QChar)'9'; + str[i] = (TQChar)'9'; break; case '9': - str[i] = (QChar)'0'; + str[i] = (TQChar)'0'; if (i == 0) str.prepend('1'); continue; case '.': @@ -1311,8 +1310,8 @@ TQString TDELocale::formatNumber(const TQString &numStr, bool round, // Skip the sign (for now) - bool neg = (tmpString[0] == (QChar)'-'); - if (neg || tmpString[0] == (QChar)'+') tmpString.remove(0, 1); + bool neg = (tmpString[0] == (TQChar)'-'); + if (neg || tmpString[0] == (TQChar)'+') tmpString.remove(0, 1); // Split off exponential part (including 'e'-symbol) TQString mantString = tmpString.section('e', 0, 0, @@ -1473,7 +1472,7 @@ double TDELocale::readNumber(const TQString &_str, bool * ok) const } TQString tot; - if (neg) tot = (QChar)'-'; + if (neg) tot = (TQChar)'-'; tot += major + '.' + minor + exponentialPart; @@ -1503,7 +1502,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const // (with a special case for parenthesis) if (negativeMonetarySignPosition() == ParensAround) { - if (str[0] == (QChar)'(' && str[str.length()-1] == (QChar)')') + if (str[0] == (TQChar)'(' && str[str.length()-1] == (TQChar)')') { neg = true; str.remove(str.length()-1,1); @@ -1570,7 +1569,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const } TQString tot; - if (neg) tot = (QChar)'-'; + if (neg) tot = (TQChar)'-'; tot += major + '.' + minior; return tot.toDouble(ok); } @@ -1627,7 +1626,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok TQChar c = fmt.at(fmtpos++); - if (c != (QChar)'%') { + if (c != (TQChar)'%') { if (c.isSpace() && str.at(strpos).isSpace()) strpos++; else if (c != str.at(strpos++)) @@ -1649,7 +1648,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok error = true; j = 1; while (error && (j < 8)) { - TQString s = calendar()->weekDayName(j, c == (QChar)'a').lower(); + TQString s = calendar()->weekDayName(j, c == (TQChar)'a').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { @@ -1666,7 +1665,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok if (d->nounDeclension && d->dateMonthNamePossessive) { j = 1; while (error && (j < 13)) { - TQString s = calendar()->monthNamePossessive(j, year, c == (QChar)'b').lower(); + TQString s = calendar()->monthNamePossessive(j, year, c == (TQChar)'b').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { month = j; @@ -1678,7 +1677,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok } j = 1; while (error && (j < 13)) { - TQString s = calendar()->monthName(j, year, c == (QChar)'b').lower(); + TQString s = calendar()->monthName(j, year, c == (TQChar)'b').lower(); int len = s.length(); if (str.mid(strpos, len) == s) { month = j; @@ -1767,7 +1766,7 @@ TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok TQChar c = Format.at(Formatpos++); - if (c != (QChar)'%') + if (c != (TQChar)'%') { if (c.isSpace()) strpos++; @@ -1886,7 +1885,7 @@ TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDur switch ( TQChar(rst.at( format_index )).unicode() ) { case '%': - buffer[index++] = (QChar)'%'; + buffer[index++] = (TQChar)'%'; break; case 'H': put_it_in( buffer, index, pTime.hour() ); @@ -1970,8 +1969,8 @@ TQString TDELocale::formatDateTime(const TQDateTime &pDateTime, bool includeSeconds) const { return translate("concatenation of dates and time", "%1 %2") - .arg( formatDate( TQT_TQDATE_OBJECT(pDateTime.date()), shortFormat ) ) - .arg( formatTime( TQT_TQTIME_OBJECT(pDateTime.time()), includeSeconds ) ); + .arg( formatDate( pDateTime.date(), shortFormat ) ) + .arg( formatTime( pDateTime.time(), includeSeconds ) ); } TQString i18n(const char* text) @@ -2084,22 +2083,12 @@ void TDELocale::initFileNameEncoding(TDEConfig *) // which, on Unix platforms, use the locale's codec. } -#ifdef USE_QT3 TQCString TDELocale::encodeFileNameUTF8( const TQString & fileName ) -#endif // USE_QT3 -#ifdef USE_QT4 -QByteArray TDELocale::encodeFileNameUTF8( const QString & fileName ) -#endif // USE_QT4 { return TQString(fileName).utf8(); } -#ifdef USE_QT3 TQString TDELocale::decodeFileNameUTF8( const TQCString & localFileName ) -#endif // USE_QT3 -#ifdef USE_QT4 -QString TDELocale::decodeFileNameUTF8( const QByteArray & localFileName ) -#endif // USE_QT4 { return TQString::fromUtf8(localFileName); } @@ -2275,7 +2264,7 @@ TQString TDELocale::defaultCountry() const char * TDELocale::encoding() const { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (0==qstrcmp("System", codecForEncoding()->name())) { //win32 returns "System" codec name here but KDE apps expect a real name: diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h index 4bee48dde..395344890 100644 --- a/tdecore/tdelocale.h +++ b/tdecore/tdelocale.h @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> Copyright (C) 1999-2003 Hans Petter Bieker <bieker@kde.org> @@ -411,7 +410,7 @@ public: * * calls formatNumber(numStr, 2) */ - TQString formatNumber(const TQString &numStr) const KDE_DEPRECATED; + TQString formatNumber(const TQString &numStr) const TDE_DEPRECATED; /** * Given a string representing a number, converts that to a numeric @@ -513,7 +512,7 @@ public: * * @return true if the week starts on Monday */ - bool weekStartsMonday() const KDE_DEPRECATED; //### remove for KDE 4.0 + bool weekStartsMonday() const TDE_DEPRECATED; //### remove for KDE 4.0 /** * Use this to determine which day is the first day of the week. @@ -543,7 +542,7 @@ public: * \endcode * to the applicable file. */ - TQString monthName(int i, bool shortName = false) const KDE_DEPRECATED; + TQString monthName(int i, bool shortName = false) const TDE_DEPRECATED; /** * @deprecated @@ -568,7 +567,7 @@ public: * \endcode * to the applicable file. */ - TQString monthNamePossessive(int i, bool shortName = false) const KDE_DEPRECATED; + TQString monthNamePossessive(int i, bool shortName = false) const TDE_DEPRECATED; /** * @deprecated use calendar()->weekDayName @@ -580,7 +579,7 @@ public: * * @return The name of the day */ - TQString weekDayName(int i, bool shortName = false) const KDE_DEPRECATED; + TQString weekDayName(int i, bool shortName = false) const TDE_DEPRECATED; /** * Returns a pointer to the calendar system object. @@ -881,7 +880,7 @@ public: * * @param start True if Monday is the first day in the week */ - void setWeekStartsMonday(bool start) KDE_DEPRECATED; //### remove for KDE 4.0 + void setWeekStartsMonday(bool start) TDE_DEPRECATED; //### remove for KDE 4.0 /** * Changes how TDELocale defines the first day in week. @@ -1149,7 +1148,7 @@ private: * @deprecated * use formatMoney(double) */ - TQString formatMoney(const TQString &numStr) const KDE_DEPRECATED; + TQString formatMoney(const TQString &numStr) const TDE_DEPRECATED; /** * @deprecated @@ -1157,19 +1156,19 @@ private: * * @return String containing language codes separated by colons */ - TQString languages() const KDE_DEPRECATED; + TQString languages() const TDE_DEPRECATED; /** * @deprecated * @return True */ - bool setCharset(const TQString & charset) KDE_DEPRECATED; + bool setCharset(const TQString & charset) TDE_DEPRECATED; /** * @deprecated * @see encoding */ - TQString charset() const KDE_DEPRECATED; + TQString charset() const TDE_DEPRECATED; protected: /** @@ -1221,22 +1220,12 @@ private: /** * @internal A TQFile filename encoding function (TQFile::encodeFn). */ -#ifdef USE_QT3 static TQCString encodeFileNameUTF8( const TQString & fileName ); -#endif // USE_QT3 -#ifdef USE_QT4 - static QByteArray encodeFileNameUTF8( const QString & fileName ); -#endif // USE_QT4 /** * @internal TQFile filename decoding function (TQFile::decodeFn). */ -#ifdef USE_QT3 static TQString decodeFileNameUTF8( const TQCString & localFileName ); -#endif // USE_QT3 -#ifdef USE_QT4 - static QString decodeFileNameUTF8( const QByteArray & localFileName ); -#endif // USE_QT4 /** * @internal Changes the file name of the catalog to the correct diff --git a/tdecore/kdemacros.h.cmake b/tdecore/tdemacros.h.cmake index 083cc8c8d..34c945872 100644 --- a/tdecore/kdemacros.h.cmake +++ b/tdecore/tdemacros.h.cmake @@ -1,5 +1,5 @@ -/* This file is part of the KDE libraries - Copyright (c) 2002-2003 KDE Team +/* This file is part of the TDE libraries + Copyright (c) 2002-2003 TDE Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,15 +17,15 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KDE_MACROS_H_ -#define _KDE_MACROS_H_ +#ifndef _TDE_MACROS_H_ +#define _TDE_MACROS_H_ /* Set by configure */ #cmakedefine __TDE_HAVE_TDEHWLIB 1 -#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 +#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1 /** - * The KDE_NO_EXPORT macro marks the symbol of the given variable + * The TDE_NO_EXPORT macro marks the symbol of the given variable * to be hidden. A hidden symbol is stripped during the linking step, * so it can't be used from outside the resulting library, which is similar * to static. However, static limits the visibility to the current @@ -33,135 +33,100 @@ * units. * * \code - * int KDE_NO_EXPORT foo; - * int KDE_EXPORT bar; + * int TDE_NO_EXPORT foo; + * int TDE_EXPORT bar; * \end */ -#ifdef __KDE_HAVE_GCC_VISIBILITY -#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) -#define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) -#define KDE_NO_EXPORT -#define KDE_EXPORT __declspec(dllexport) +#ifdef __TDE_HAVE_GCC_VISIBILITY +#define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) +#define TDE_EXPORT __attribute__ ((visibility("default"))) +#elif defined(TQ_WS_WIN) +#define TDE_NO_EXPORT +#define TDE_EXPORT __declspec(dllexport) #else -#define KDE_NO_EXPORT -#define KDE_EXPORT +#define TDE_NO_EXPORT +#define TDE_EXPORT #endif /** - * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to + * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to * cope with symbol visibility. */ -#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) /** - * The KDE_PACKED can be used to hint the compiler that a particular + * The TDE_PACKED can be used to hint the compiler that a particular * structure or class should not contain unnecessary paddings. */ #ifdef __GNUC__ -#define KDE_PACKED __attribute__((__packed__)) +#define TDE_PACKED __attribute__((__packed__)) #else -#define KDE_PACKED +#define TDE_PACKED #endif /** - * The KDE_DEPRECATED macro can be used to trigger compile-time warnings + * The TDE_DEPRECATED macro can be used to trigger compile-time warnings * with newer compilers when deprecated functions are used. * * For non-inline functions, the macro gets inserted at the very end of the * function declaration, right before the semicolon: * * \code - * DeprecatedConstructor() KDE_DEPRECATED; - * void deprecatedFunctionA() KDE_DEPRECATED; - * int deprecatedFunctionB() const KDE_DEPRECATED; + * DeprecatedConstructor() TDE_DEPRECATED; + * void deprecatedFunctionA() TDE_DEPRECATED; + * int deprecatedFunctionB() const TDE_DEPRECATED; * \endcode * * Functions which are implemented inline are handled differently: for them, - * the KDE_DEPRECATED macro is inserted at the front, right before the return + * the TDE_DEPRECATED macro is inserted at the front, right before the return * type, but after "static" or "virtual": * * \code - * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. } - * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. } - * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } + * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. } + * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. } + * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } * \end * * You can also mark whole structs or classes as deprecated, by inserting the - * KDE_DEPRECATED macro after the struct/class keyword, but before the + * TDE_DEPRECATED macro after the struct/class keyword, but before the * name of the struct/class: * * \code - * class KDE_DEPRECATED DeprecatedClass { }; - * struct KDE_DEPRECATED DeprecatedStruct { }; + * class TDE_DEPRECATED DeprecatedClass { }; + * struct TDE_DEPRECATED DeprecatedStruct { }; * \endcode * * \note - * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal; + * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal; * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to * other signals; they get invoked from moc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be - * aware that if the slots get triggered by a signal, the will get called from + * aware that if the slots get triggered by a signal, it will get called from * moc code as well and thus the warnings are useless. * * \par - * Also note that it is not possible to use KDE_DEPRECATED for classes which + * Also note that it is not possible to use TDE_DEPRECATED for classes which * use the k_dcop keyword (to indicate a DCOP interface declaration); this is * because the dcopidl program would choke on the unexpected declaration * syntax. */ -#ifndef KDE_DEPRECATED -#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) - /* gcc >= 3.2 */ -# define KDE_DEPRECATED __attribute__ ((deprecated)) -#elif defined(_MSC_VER) && (_MSC_VER >= 1300) - /* msvc >= 7 */ -# define KDE_DEPRECATED __declspec(deprecated) -#else -# define KDE_DEPRECATED -#endif -#endif - -/** - * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to - * 'true'. When used in an if ( ) statement, it gives a hint to the compiler - * that the following codeblock is likely to get executed. Providing this - * information helps the compiler to optimize the code for better performance. - * Using the macro has an insignificant code size or runtime memory footprint impact. - * The code semantics is not affected. - * - * \note - * Providing wrong information ( like marking a condition that almost never - * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only - * use it for cases where you can be sure about the odds of the expression to pass - * in all cases ( independent from e.g. user configuration ). - * - * \par - * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. - * - * \note - * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY ! - * - * \code - * if ( KDE_ISUNLIKELY( testsomething() ) ) - * abort(); // assume its unlikely that the application aborts - * \endcode - */ -#if __GNUC__ - 0 >= 3 -# define KDE_ISLIKELY( x ) __builtin_expect(!!(x),1) -# define KDE_ISUNLIKELY( x ) __builtin_expect(!!(x),0) -#else -# define KDE_ISLIKELY( x ) ( x ) -# define KDE_ISUNLIKELY( x ) ( x ) +#ifndef TDE_DEPRECATED + #ifdef __GNUC__ + #define TDE_DEPRECATED __attribute__ ((deprecated)) + #elif defined(_MSC_VER) + #define TDE_DEPRECATED __declspec(deprecated) + #else + #define TDE_DEPRECATED + #endif #endif /** @@ -207,15 +172,15 @@ RESERVE_VIRTUAL_9 /** - * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that + * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that * a particular function should be a weak symbol (that e.g. may be overriden * in another library, -Bdirect will not bind this symbol directly) */ #ifdef __GNUC__ -#define KDE_WEAK_SYMBOL __attribute__((__weak__)) +#define TDE_WEAK_SYMBOL __attribute__((__weak__)) #else -#define KDE_WEAK_SYMBOL +#define TDE_WEAK_SYMBOL #endif -#endif /* _KDE_MACROS_H_ */ +#endif /* _TDE_MACROS_H_ */ diff --git a/tdecore/kdemacros.h.in b/tdecore/tdemacros.h.in index 9566c386b..9df1a77ab 100644 --- a/tdecore/kdemacros.h.in +++ b/tdecore/tdemacros.h.in @@ -17,14 +17,14 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KDE_MACROS_H_ -#define _KDE_MACROS_H_ +#ifndef _TDE_MACROS_H_ +#define _TDE_MACROS_H_ /* Set by configure */ -#undef __KDE_HAVE_GCC_VISIBILITY +#undef __TDE_HAVE_GCC_VISIBILITY /** - * The KDE_NO_EXPORT macro marks the symbol of the given variable + * The TDE_NO_EXPORT macro marks the symbol of the given variable * to be hidden. A hidden symbol is stripped during the linking step, * so it can't be used from outside the resulting library, which is similar * to static. However, static limits the visibility to the current @@ -32,135 +32,100 @@ * units. * * \code - * int KDE_NO_EXPORT foo; - * int KDE_EXPORT bar; + * int TDE_NO_EXPORT foo; + * int TDE_EXPORT bar; * \end */ -#ifdef __KDE_HAVE_GCC_VISIBILITY -#define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) -#define KDE_EXPORT __attribute__ ((visibility("default"))) -#elif defined(Q_WS_WIN) -#define KDE_NO_EXPORT -#define KDE_EXPORT __declspec(dllexport) +#ifdef __TDE_HAVE_GCC_VISIBILITY +#define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) +#define TDE_EXPORT __attribute__ ((visibility("default"))) +#elif defined(TQ_WS_WIN) +#define TDE_NO_EXPORT +#define TDE_EXPORT __declspec(dllexport) #else -#define KDE_NO_EXPORT -#define KDE_EXPORT +#define TDE_NO_EXPORT +#define TDE_EXPORT #endif /** - * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to + * TDE_EXPORT_PLUGIN is a workaround for Qt not being able to * cope with symbol visibility. */ -#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ - TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ +#define TDE_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ TQ_EXPORT_PLUGIN(PLUGIN) /** - * The KDE_PACKED can be used to hint the compiler that a particular + * The TDE_PACKED can be used to hint the compiler that a particular * structure or class should not contain unnecessary paddings. */ #ifdef __GNUC__ -#define KDE_PACKED __attribute__((__packed__)) +#define TDE_PACKED __attribute__((__packed__)) #else -#define KDE_PACKED +#define TDE_PACKED #endif /** - * The KDE_DEPRECATED macro can be used to trigger compile-time warnings + * The TDE_DEPRECATED macro can be used to trigger compile-time warnings * with newer compilers when deprecated functions are used. * * For non-inline functions, the macro gets inserted at the very end of the * function declaration, right before the semicolon: * * \code - * DeprecatedConstructor() KDE_DEPRECATED; - * void deprecatedFunctionA() KDE_DEPRECATED; - * int deprecatedFunctionB() const KDE_DEPRECATED; + * DeprecatedConstructor() TDE_DEPRECATED; + * void deprecatedFunctionA() TDE_DEPRECATED; + * int deprecatedFunctionB() const TDE_DEPRECATED; * \endcode * * Functions which are implemented inline are handled differently: for them, - * the KDE_DEPRECATED macro is inserted at the front, right before the return + * the TDE_DEPRECATED macro is inserted at the front, right before the return * type, but after "static" or "virtual": * * \code - * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. } - * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. } - * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } + * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. } + * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. } + * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. } * \end * * You can also mark whole structs or classes as deprecated, by inserting the - * KDE_DEPRECATED macro after the struct/class keyword, but before the + * TDE_DEPRECATED macro after the struct/class keyword, but before the * name of the struct/class: * * \code - * class KDE_DEPRECATED DeprecatedClass { }; - * struct KDE_DEPRECATED DeprecatedStruct { }; + * class TDE_DEPRECATED DeprecatedClass { }; + * struct TDE_DEPRECATED DeprecatedStruct { }; * \endcode * * \note - * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal; + * It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal; * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to * other signals; they get invoked from moc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be - * aware that if the slots get triggered by a signal, the will get called from + * aware that if the slots get triggered by a signal, it will get called from * moc code as well and thus the warnings are useless. * * \par - * Also note that it is not possible to use KDE_DEPRECATED for classes which + * Also note that it is not possible to use TDE_DEPRECATED for classes which * use the k_dcop keyword (to indicate a DCOP interface declaration); this is * because the dcopidl program would choke on the unexpected declaration * syntax. */ -#ifndef KDE_DEPRECATED -#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2) - /* gcc >= 3.2 */ -# define KDE_DEPRECATED __attribute__ ((deprecated)) -#elif defined(_MSC_VER) && (_MSC_VER >= 1300) - /* msvc >= 7 */ -# define KDE_DEPRECATED __declspec(deprecated) -#else -# define KDE_DEPRECATED -#endif -#endif - -/** - * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to - * 'true'. When used in an if ( ) statement, it gives a hint to the compiler - * that the following codeblock is likely to get executed. Providing this - * information helps the compiler to optimize the code for better performance. - * Using the macro has an insignificant code size or runtime memory footprint impact. - * The code semantics is not affected. - * - * \note - * Providing wrong information ( like marking a condition that almost never - * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only - * use it for cases where you can be sure about the odds of the expression to pass - * in all cases ( independent from e.g. user configuration ). - * - * \par - * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. - * - * \note - * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY ! - * - * \code - * if ( KDE_ISUNLIKELY( testsomething() ) ) - * abort(); // assume its unlikely that the application aborts - * \endcode - */ -#if __GNUC__ - 0 >= 3 -# define KDE_ISLIKELY( x ) __builtin_expect(!!(x),1) -# define KDE_ISUNLIKELY( x ) __builtin_expect(!!(x),0) -#else -# define KDE_ISLIKELY( x ) ( x ) -# define KDE_ISUNLIKELY( x ) ( x ) +#ifndef TDE_DEPRECATED + #ifdef __GNUC__ + #define TDE_DEPRECATED __attribute__ ((deprecated)) + #elif defined(_MSC_VER) + #define TDE_DEPRECATED __declspec(deprecated) + #else + #define TDE_DEPRECATED + #endif #endif /** @@ -206,15 +171,15 @@ RESERVE_VIRTUAL_9 /** - * The KDE_WEAK_SYMBOL macro can be used to tell the compiler that + * The TDE_WEAK_SYMBOL macro can be used to tell the compiler that * a particular function should be a weak symbol (that e.g. may be overriden * in another library, -Bdirect will not bind this symbol directly) */ #ifdef __GNUC__ -#define KDE_WEAK_SYMBOL __attribute__((__weak__)) +#define TDE_WEAK_SYMBOL __attribute__((__weak__)) #else -#define KDE_WEAK_SYMBOL +#define TDE_WEAK_SYMBOL #endif -#endif /* _KDE_MACROS_H_ */ +#endif /* _TDE_MACROS_H_ */ diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h index bfc408019..631959bc0 100644 --- a/tdecore/tdemultipledrag.h +++ b/tdecore/tdemultipledrag.h @@ -53,7 +53,7 @@ class KMultipleDragPrivate; */ class TDECORE_EXPORT KMultipleDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/kprocctrl.cpp b/tdecore/tdeprocctrl.cpp index 76ad0b167..05ff0566a 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/tdeprocctrl.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include "kprocess.h" -#include "kprocctrl.h" +#include "tdeprocess.h" +#include "tdeprocctrl.h" #include <config.h> @@ -71,8 +71,8 @@ TDEProcessController::TDEProcessController() notifier = new TQSocketNotifier( fd[0], TQSocketNotifier::Read ); notifier->setEnabled( true ); - TQObject::connect( notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotDoHousekeeping())); + TQObject::connect( notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotDoHousekeeping())); } TDEProcessController::~TDEProcessController() @@ -274,4 +274,4 @@ void TDEProcessController::addProcess( int pid ) ref(); // make sure we stay around when the TDEProcess goes away } -#include "kprocctrl.moc" +#include "tdeprocctrl.moc" diff --git a/tdecore/kprocctrl.h b/tdecore/tdeprocctrl.h index 1cb6cc302..fa9a8b3b4 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/tdeprocctrl.h @@ -17,12 +17,12 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KPROCCTRL_H__ -#define __KPROCCTRL_H__ +#ifndef __TDEPROCCTRL_H__ +#define __TDEPROCCTRL_H__ #include <tqvaluelist.h> -#include "kprocess.h" +#include "tdeprocess.h" class TQSocketNotifier; @@ -38,7 +38,7 @@ class TQSocketNotifier; */ class TDECORE_EXPORT TDEProcessController : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdecore/kprocess.cpp b/tdecore/tdeprocess.cpp index b899c637f..185bd5a6f 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/tdeprocess.cpp @@ -22,8 +22,8 @@ */ -#include "kprocess.h" -#include "kprocctrl.h" +#include "tdeprocess.h" +#include "tdeprocctrl.h" #include "kpty.h" #include <config.h> @@ -32,11 +32,6 @@ #define __svr4__ #endif -#ifdef __osf__ -#define _OSF_SOURCE -#include <float.h> -#endif - #ifdef _AIX #define _ALL_SOURCE #endif @@ -77,7 +72,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> @@ -629,7 +624,7 @@ bool TDEProcess::writeStdin(const char *buffer, int buflen) { // if there is still data pending, writing new data // to stdout is not allowed (since it could also confuse - // kprocess ...) + // tdeprocess ...) if (input_data != 0) return false; @@ -959,15 +954,15 @@ int TDEProcess::commSetupDoneP() innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this); TQ_CHECK_PTR(innot); innot->setEnabled(false); // will be enabled when data has to be sent - TQObject::connect(innot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSendData(int))); + TQObject::connect(innot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSendData(int))); } if (communication & Stdout) { outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this); TQ_CHECK_PTR(outnot); - TQObject::connect(outnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildOutput(int))); + TQObject::connect(outnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildOutput(int))); if (communication & NoRead) suspend(); } @@ -975,8 +970,8 @@ int TDEProcess::commSetupDoneP() if (communication & Stderr) { errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this ); TQ_CHECK_PTR(errnot); - TQObject::connect(errnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildError(int))); + TQObject::connect(errnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildError(int))); } return 1; @@ -1134,4 +1129,4 @@ bool KShellProcess::start(RunMode runmode, Communication comm) void KShellProcess::virtual_hook( int id, void* data ) { TDEProcess::virtual_hook( id, data ); } -#include "kprocess.moc" +#include "tdeprocess.moc" diff --git a/tdecore/kprocess.h b/tdecore/tdeprocess.h index ae4a25af6..a6329f147 100644 --- a/tdecore/kprocess.h +++ b/tdecore/tdeprocess.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __kprocess_h__ -#define __kprocess_h__ +#ifndef __TDEPROCESS_H__ +#define __TDEPROCESS_H__ #include <sys/types.h> // for pid_t #include <sys/wait.h> @@ -47,7 +47,7 @@ class KPty; * This class allows a KDE application to start child processes without having * to worry about UN*X signal handling issues and zombie process reaping. * - * @see KProcIO + * @see TDEProcIO * * Basically, this class distinguishes three different ways of running * child processes: @@ -96,8 +96,8 @@ class KPty; * * *proc << "my_executable"; * *proc << "These" << "are" << "the" << "command" << "line" << "args"; - * TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - * pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *))); + * TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + * pointer_to_my_object, TQ_SLOT(my_objects_slot(TDEProcess *))); * proc->start(); * \endcode * @@ -129,7 +129,7 @@ class KPty; **/ class TDECORE_EXPORT TDEProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -219,7 +219,7 @@ public: @see operator<<() */ - bool setExecutable(const TQString& proc) KDE_DEPRECATED; + bool setExecutable(const TQString& proc) TDE_DEPRECATED; /** @@ -320,7 +320,7 @@ public: * @deprecated * Use pid() instead. */ - KDE_DEPRECATED pid_t getPid() const { return pid(); } + TDE_DEPRECATED pid_t getPid() const { return pid(); } /** * Suspend processing of data from stdout of the child process. @@ -757,7 +757,7 @@ protected: * TDEProcess slots. * * For a more detailed explanation, it is best to have a look at the default - * implementation in kprocess.cpp. + * implementation in tdeprocess.cpp. */ virtual int commSetupDoneP(); @@ -780,7 +780,7 @@ protected: /** * Cleans up the communication links to the child after it has exited. * This function should act upon the values of pid() and runs. - * See the kprocess.cpp source for details. + * See the tdeprocess.cpp source for details. * @li If pid() returns zero, the communication links should be closed * only. * @li if pid() returns non-zero and runs is false, all data @@ -903,7 +903,7 @@ class KShellProcessPrivate; */ class TDECORE_EXPORT KShellProcess: public TDEProcess { - Q_OBJECT + TQ_OBJECT public: @@ -933,7 +933,4 @@ private: KShellProcessPrivate *d; }; - - #endif - diff --git a/tdecore/kprocio.cpp b/tdecore/tdeprocio.cpp index 7157662df..e614148c5 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/tdeprocio.cpp @@ -24,19 +24,19 @@ #include <stdio.h> -#include "kprocio.h" +#include "tdeprocio.h" #include <kdebug.h> #include <tqtextcodec.h> -class KProcIOPrivate { +class TDEProcIOPrivate { public: - KProcIOPrivate() : comm(TDEProcess::All) {} + TDEProcIOPrivate() : comm(TDEProcess::All) {} TDEProcess::Communication comm; }; -KProcIO::KProcIO ( TQTextCodec *_codec) - : codec(_codec), d(new KProcIOPrivate) +TDEProcIO::TDEProcIO ( TQTextCodec *_codec) + : codec(_codec), d(new TDEProcIOPrivate) { rbi=0; readsignalon=writeready=true; @@ -52,13 +52,13 @@ KProcIO::KProcIO ( TQTextCodec *_codec) } } -KProcIO::~KProcIO() +TDEProcIO::~TDEProcIO() { delete d; } void -KProcIO::resetAll () +TDEProcIO::resetAll () { if (isRunning()) kill(); @@ -67,47 +67,47 @@ KProcIO::resetAll () rbi=0; readsignalon=writeready=true; - disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + disconnect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); outbuffer.clear(); } -void KProcIO::setComm (Communication comm) +void TDEProcIO::setComm (Communication comm) { d->comm = comm; } -bool KProcIO::start (RunMode runmode, bool includeStderr) +bool TDEProcIO::start (RunMode runmode, bool includeStderr) { - connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); if (includeStderr) { - connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); } - connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); return TDEProcess::start (runmode, d->comm); } -bool KProcIO::writeStdin (const TQString &line, bool appendnewline) +bool TDEProcIO::writeStdin (const TQString &line, bool appendnewline) { return writeStdin(TQCString(codec->fromUnicode(line)), appendnewline); } -bool KProcIO::writeStdin (const TQCString &line, bool appendnewline) +bool TDEProcIO::writeStdin (const TQCString &line, bool appendnewline) { TQCString *qs = new TQCString(line); @@ -136,7 +136,7 @@ bool KProcIO::writeStdin (const TQCString &line, bool appendnewline) return true; } -bool KProcIO::writeStdin(const TQByteArray &data) +bool TDEProcIO::writeStdin(const TQByteArray &data) { if (!data.size()) return true; @@ -151,7 +151,7 @@ bool KProcIO::writeStdin(const TQByteArray &data) return true; } -void KProcIO::closeWhenDone() +void TDEProcIO::closeWhenDone() { if (writeready) { @@ -163,7 +163,7 @@ void KProcIO::closeWhenDone() return; } -void KProcIO::sent(TDEProcess *) +void TDEProcIO::sent(TDEProcess *) { outbuffer.removeFirst(); @@ -186,21 +186,21 @@ void KProcIO::sent(TDEProcess *) } -void KProcIO::received (TDEProcess *, char *buffer, int buflen) +void TDEProcIO::received (TDEProcess *, char *buffer, int buflen) { recvbuffer += TQCString(buffer, buflen+1); controlledEmission(); } -void KProcIO::ackRead () +void TDEProcIO::ackRead () { readsignalon=true; if (needreadsignal || recvbuffer.length()!=0) controlledEmission(); } -void KProcIO::controlledEmission () +void TDEProcIO::controlledEmission () { if (readsignalon) { @@ -214,7 +214,7 @@ void KProcIO::controlledEmission () } } -void KProcIO::enableReadSignals (bool enable) +void TDEProcIO::enableReadSignals (bool enable) { readsignalon=enable; @@ -222,7 +222,7 @@ void KProcIO::enableReadSignals (bool enable) emit readReady (this); } -int KProcIO::readln (TQString &line, bool autoAck, bool *partial) +int TDEProcIO::readln (TQString &line, bool autoAck, bool *partial) { int len; @@ -269,8 +269,8 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial) } -void KProcIO::virtual_hook( int id, void* data ) +void TDEProcIO::virtual_hook( int id, void* data ) { TDEProcess::virtual_hook( id, data ); } -#include "kprocio.moc" +#include "tdeprocio.moc" diff --git a/tdecore/kprocio.h b/tdecore/tdeprocio.h index 4e42ee533..d7394b8b1 100644 --- a/tdecore/kprocio.h +++ b/tdecore/tdeprocio.h @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1997 David Sweet <dsweet@kde.org> This library is free software; you can redistribute it and/or @@ -15,29 +15,29 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KPROCIO_H_ -#define KPROCIO_H_ +#ifndef TDEPROCIO_H_ +#define TDEPROCIO_H_ #include <tqstring.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqstrlist.h> #include "tdelibs_export.h" -class KProcIOPrivate; +class TDEProcIOPrivate; class TQTextCodec; /** - * KProcIO + * TDEProcIO * * This class provides a slightly simpler interface to the communication * functions provided by TDEProcess. The simplifications are: - * @li The buffer for a write is copied to an internal KProcIO + * @li The buffer for a write is copied to an internal TDEProcIO * buffer and maintained/freed appropriately. There is no need * to be concerned with wroteStdin() signals _at_all_. * @li readln() reads a line of data and buffers any leftovers. * @li Conversion from/to unicode. * - * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs(). + * Basically, TDEProcIO gives you buffered I/O similar to fgets()/fputs(). * * Aside from these, and the fact that start() takes different * parameters, use this class just like TDEProcess. @@ -47,20 +47,20 @@ class TQTextCodec; **/ -class TDECORE_EXPORT KProcIO : public TDEProcess +class TDECORE_EXPORT TDEProcIO : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - KProcIO ( TQTextCodec *codec = 0 ); + TDEProcIO ( TQTextCodec *codec = 0 ); /** * Destructor */ - ~KProcIO(); + ~TDEProcIO(); /** * Sets the communication mode to be passed to TDEProcess::start() @@ -120,7 +120,7 @@ public: * @return true if successful, false otherwise * @deprecated **/ - KDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true) + TDE_DEPRECATED bool fputs (const TQString &line, bool AppendNewLine=true) { return writeStdin(line, AppendNewLine); } /** @@ -135,7 +135,7 @@ public: * You may use it multiple times if more than one line of data is * available. * Be sure to use ackRead() when you have finished processing the - * readReady() signal. This informs KProcIO that you are ready for + * readReady() signal. This informs TDEProcIO that you are ready for * another readReady() signal. * * readln() never blocks. @@ -159,7 +159,7 @@ public: * @deprecated use readln. Note that it has an inverted autoAck default, * though. **/ - KDE_DEPRECATED int fgets (TQString &line, bool autoAck=false) + TDE_DEPRECATED int fgets (TQString &line, bool autoAck=false) { return readln (line, autoAck); } /** @@ -192,7 +192,7 @@ signals: * @param pio the process that emitted the signal * @see enableReadSignals() */ - void readReady(KProcIO *pio); + void readReady(TDEProcIO *pio); protected: TQPtrList<TQByteArray> outbuffer; @@ -210,8 +210,7 @@ protected slots: protected: virtual void virtual_hook( int id, void* data ); private: - KProcIOPrivate *d; + TDEProcIOPrivate *d; }; -#endif // KPROCIO_H_ - +#endif diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp index 86b532f9c..e4337163f 100644 --- a/tdecore/tdeshortcut.cpp +++ b/tdecore/tdeshortcut.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> //---------------------------------------------------- @@ -89,10 +89,10 @@ bool KKey::init( const TQKeySequence& key ) bool KKey::init( const TQKeyEvent* pEvent ) { int keyQt = pEvent->key(); - if( pEvent->state() & TQt::ShiftButton ) keyQt |= Qt::SHIFT; - if( pEvent->state() & TQt::ControlButton ) keyQt |= Qt::CTRL; - if( pEvent->state() & TQt::AltButton ) keyQt |= Qt::ALT; - if( pEvent->state() & TQt::MetaButton ) keyQt |= Qt::META; + if( pEvent->state() & TQt::ShiftButton ) keyQt |= TQt::SHIFT; + if( pEvent->state() & TQt::ControlButton ) keyQt |= TQt::CTRL; + if( pEvent->state() & TQt::AltButton ) keyQt |= TQt::ALT; + if( pEvent->state() & TQt::MetaButton ) keyQt |= TQt::META; return init( keyQt ); } diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h index 09f7fce05..69fb3c82c 100644 --- a/tdecore/tdeshortcut.h +++ b/tdecore/tdeshortcut.h @@ -45,7 +45,7 @@ class TDECORE_EXPORT KKey * @see ModFlag */ enum { MOD_FLAG_COUNT = 4 }; - enum { QtWIN = (Qt::META) }; + enum { QtWIN = (TQt::META) }; /** * Flags to represent the modifiers. You can combine modifiers * by ORing them. @@ -68,7 +68,7 @@ class TDECORE_EXPORT KKey /** * Creates a new key for the given Qt key code. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ KKey( int keyQt ); @@ -115,7 +115,7 @@ class TDECORE_EXPORT KKey * Initializes the key with the given Qt key code. * @param keyQt the qt keycode * @return true if successful, false otherwise - * @see Qt::Key + * @see TQt::Key */ bool init( int keyQt ); @@ -217,7 +217,7 @@ class TDECORE_EXPORT KKey /** * Returns the qt key code. * @return the qt key code or 0 if there is no key set. - * @see Qt::Key + * @see TQt::Key */ int keyCodeQt() const; @@ -469,7 +469,7 @@ class TDECORE_EXPORT KKeySequence */ bool operator < ( const KKeySequence& seq ) const { return compare( seq ) < 0; } - // TODO: consider adding Qt::SequenceMatch matches(...) methods for TQKeySequence equivalence + // TODO: consider adding TQt::SequenceMatch matches(...) methods for TQKeySequence equivalence /** * Converts this key sequence to a TQKeySequence. @@ -480,7 +480,7 @@ class TDECORE_EXPORT KKeySequence /** * Returns the qt key code of the first key. * @return the qt key code of the first key - * @see Qt::Key + * @see TQt::Key * @see KKey::keyCodeQt() */ int keyCodeQt() const; @@ -528,7 +528,7 @@ class TDECORE_EXPORT KKeySequence * the below code binds the escape key to the close action. * * \code -* TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() ); +* TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); * TDEShortcut closeShortcut = closeAction->shortcut(); * closeShortcut.append( KKey(Key_Escape)); * closeAction->setShortcut(closeShortcut); @@ -561,7 +561,7 @@ class TDECORE_EXPORT TDEShortcut * Creates a new shortcut with the given Qt key code * as the only key sequence. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ TDEShortcut( int keyQt ); @@ -622,7 +622,7 @@ class TDECORE_EXPORT TDEShortcut * Initializes the shortcut with the given Qt key code * as the only key sequence. * @param keyQt the qt keycode - * @see Qt::Key + * @see TQt::Key */ bool init( int keyQt ); @@ -686,7 +686,7 @@ class TDECORE_EXPORT TDEShortcut * Returns the key code of the first key sequence, or * null if there is no first key sequence. * @return the key code of the first sequence's first key - * @see Qt::Key + * @see TQt::Key * @see KKeySequence::keyCodeQt() */ int keyCodeQt() const; diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp index ffacd001c..b4ceb86d8 100644 --- a/tdecore/tdeshortcutlist.cpp +++ b/tdecore/tdeshortcutlist.cpp @@ -6,8 +6,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> -#include <kinstance.h> +#include <tdeglobalaccel.h> +#include <tdeinstance.h> #include <tdeshortcut.h> #include "tdeshortcutlist.h" diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp index c035c0df9..bf381bf78 100644 --- a/tdecore/tdeshortcutmenu.cpp +++ b/tdecore/tdeshortcutmenu.cpp @@ -84,14 +84,14 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent ) KKey key( pEvent ); switch( pEvent->key() ) { - case TQ_Key_Shift: - case TQ_Key_Control: - case TQ_Key_Alt: - case TQ_Key_Meta: - case TQ_Key_Super_L: - case TQ_Key_Super_R: - case TQ_Key_Hyper_L: - case TQ_Key_Hyper_R: + case Key_Shift: + case Key_Control: + case Key_Alt: + case Key_Meta: + case Key_Super_L: + case Key_Super_R: + case Key_Hyper_L: + case Key_Hyper_R: break; default: int iItem = searchForKey( key ); @@ -104,8 +104,8 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent ) if( iItem == -1 ) { // Let Up and Down keys navigate menu, // And permit Enter, Return to select the item. - if( pEvent->key() == Qt::Key_Up || pEvent->key() == Qt::Key_Down || - pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return ) + if( pEvent->key() == TQt::Key_Up || pEvent->key() == TQt::Key_Down || + pEvent->key() == TQt::Key_Enter || pEvent->key() == TQt::Key_Return ) TQPopupMenu::keyPressEvent( pEvent ); else close(); diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h index ece721942..0387bdbae 100644 --- a/tdecore/tdeshortcutmenu.h +++ b/tdecore/tdeshortcutmenu.h @@ -34,7 +34,7 @@ class TDEAccelActions; */ class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq ); diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/tdesimpleconfig.cpp index dc359f17e..15638dd65 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/tdesimpleconfig.cpp @@ -32,16 +32,16 @@ #include <tqdir.h> #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeconfigbackend.h" -#include "ksimpleconfig.h" +#include "tdesimpleconfig.h" -KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) +TDESimpleConfig::TDESimpleConfig(const TQString &fileName, bool bReadOnly) : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // the difference between TDEConfig and KSimpleConfig is just that - // for KSimpleConfig an absolute filename is guaranteed + // the difference between TDEConfig and TDESimpleConfig is just that + // for TDESimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { backEnd->changeFileName( TDEGlobal::dirs()-> saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false); @@ -52,20 +52,20 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) reparseConfiguration(); } -KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) +TDESimpleConfig::TDESimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) : TDEConfig(backEnd, bReadOnly) {} -KSimpleConfig::~KSimpleConfig() +TDESimpleConfig::~TDESimpleConfig() { - // we need to call the KSimpleConfig version of sync. Relying on the - // regular TDEConfig sync is bad, because the KSimpleConfig sync has + // we need to call the TDESimpleConfig version of sync. Relying on the + // regular TDEConfig sync is bad, because the TDESimpleConfig sync has // different behavior. Syncing here will insure that the sync() call // in the TDEConfig destructor doesn't actually do anything. sync(); } -void KSimpleConfig::sync() +void TDESimpleConfig::sync() { if (isReadOnly()) return; @@ -75,7 +75,7 @@ void KSimpleConfig::sync() rollback(); } -void KSimpleConfig::virtual_hook( int id, void* data ) +void TDESimpleConfig::virtual_hook( int id, void* data ) { TDEConfig::virtual_hook( id, data ); } -#include "ksimpleconfig.moc" +#include "tdesimpleconfig.moc" diff --git a/tdecore/ksimpleconfig.h b/tdecore/tdesimpleconfig.h index 541117500..ec3e552b8 100644 --- a/tdecore/ksimpleconfig.h +++ b/tdecore/tdesimpleconfig.h @@ -18,12 +18,12 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KSIMPLECONFIG_H -#define _KSIMPLECONFIG_H +#ifndef _TDESIMPLECONFIG_H +#define _TDESIMPLECONFIG_H #include "tdeconfig.h" -class KSimpleConfigPrivate; +class TDESimpleConfigPrivate; /** * KDE Configuration entries @@ -38,13 +38,13 @@ class KSimpleConfigPrivate; * @see TDEConfigBase TDEConfig * @short KDE Configuration Management class with deletion ability */ -class TDECORE_EXPORT KSimpleConfig : public TDEConfig +class TDECORE_EXPORT TDESimpleConfig : public TDEConfig { - Q_OBJECT + TQ_OBJECT public: /** - * Construct a KSimpleConfig object and make it either read-write + * Construct a TDESimpleConfig object and make it either read-write * or read-only. * * @param fileName The file used for saving the config data. Either @@ -53,29 +53,29 @@ public: * directory for "config" files is used. * @param bReadOnly Whether the object should be read-only. */ - KSimpleConfig( const TQString &fileName, bool bReadOnly = false); + TDESimpleConfig( const TQString &fileName, bool bReadOnly = false); - KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); + TDESimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false); /** * Destructor. * * Writes back any dirty configuration entries. */ - virtual ~KSimpleConfig(); + virtual ~TDESimpleConfig(); virtual void sync(); private: // copy-construction and assignment are not allowed - KSimpleConfig( const KSimpleConfig& ); - KSimpleConfig& operator= ( const KSimpleConfig& rConfig ); + TDESimpleConfig( const TDESimpleConfig& ); + TDESimpleConfig& operator= ( const TDESimpleConfig& rConfig ); protected: virtual void virtual_hook( int id, void* data ); private: - KSimpleConfigPrivate *d; + TDESimpleConfigPrivate *d; }; #endif diff --git a/tdecore/kstandarddirs.cpp b/tdecore/tdestandarddirs.cpp index dc9ca909a..0821b22d1 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/tdestandarddirs.cpp @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> Copyright (C) 1999 Stephan Kulow <coolo@kde.org> Copyright (C) 1999 Waldo Bastian <bastian@kde.org> @@ -46,11 +46,11 @@ #include <tqstring.h> #include <tqstringlist.h> -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeconfig.h" -#include "kinstance.h" +#include "tdeinstance.h" #include "kshell.h" -#include "ksimpleconfig.h" +#include "tdesimpleconfig.h" #include "kuser.h" #include "kstaticdeleter.h" #include <kde_file.h> @@ -74,7 +74,7 @@ public: TQStringList xdgconf_prefixes; }; -// Singleton, with data shared by all kstandarddirs instances. +// Singleton, with data shared by all tdestandarddirs instances. // Used in static methods like findExe() class TDEStandardDirsSingleton { @@ -97,7 +97,7 @@ static const char* const types[] = {"html", "html-bundle", "icon", "apps", "soun "data", "locale", "locale-bundle", "services", "mime", "servicetypes", "config", "exe", "wallpaper", "lib", "pixmap", "templates", - "module", "qtplugins", + "module", "tqtplugins", "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu", "xdgdata-icon", "xdgdata-pixmap", "xdgconf-autostart", "kcfg", "emoticons", 0 }; @@ -143,7 +143,7 @@ bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& rel void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const { TQString key; - int i = relPath.find(QChar('/')); + int i = relPath.find(TQChar('/')); if (i != -1) key = "data_"+relPath.left(i); else @@ -188,8 +188,8 @@ void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!prefixes.contains(dir)) { priorityAdd(prefixes, dir, priority); @@ -208,8 +208,8 @@ void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!d->xdgconf_prefixes.contains(dir)) { priorityAdd(d->xdgconf_prefixes, dir, priority); @@ -228,8 +228,8 @@ void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.at(dir.length() - 1) != QChar('/')) - dir += QChar('/'); + if (dir.at(dir.length() - 1) != TQChar('/')) + dir += TQChar('/'); if (!d->xdgdata_prefixes.contains(dir)) { priorityAdd(d->xdgdata_prefixes, dir, priority); @@ -270,8 +270,8 @@ bool TDEStandardDirs::addResourceType( const char *type, relatives.insert(type, rels); } TQString copy = relativename; - if (copy.at(copy.length() - 1) != QChar('/')) - copy += QChar('/'); + if (copy.at(copy.length() - 1) != TQChar('/')) + copy += TQChar('/'); if (!rels->contains(copy)) { if (priority) rels->prepend(copy); @@ -300,8 +300,8 @@ bool TDEStandardDirs::addResourceDir( const char *type, absolutes.insert(type, paths); } TQString copy = absdir; - if (copy.at(copy.length() - 1) != QChar('/')) - copy += QChar('/'); + if (copy.at(copy.length() - 1) != TQChar('/')) + copy += TQChar('/'); if (!paths->contains(copy)) { if (priority) @@ -388,7 +388,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type, if (reldir.endsWith("/")) list.append(reldir); else - list.append(reldir+QChar('/')); + list.append(reldir+TQChar('/')); } return list; } @@ -403,7 +403,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type, it != candidates.end(); ++it) { testdir.setPath(*it + reldir); if (testdir.exists()) - list.append(testdir.absPath() + QChar('/')); + list.append(testdir.absPath() + TQChar('/')); } return list; @@ -427,21 +427,21 @@ TQString TDEStandardDirs::findResourceDir( const char *type, for (TQStringList::ConstIterator it = candidates.begin(); it != candidates.end(); ++it) { if (exists(*it + filename)) { -#ifdef Q_WS_WIN //this ensures we're using installed .la files +#ifdef TQ_WS_WIN //this ensures we're using installed .la files if ((*it).isEmpty() && filename.right(3)==".la") { #ifndef NDEBUG fprintf(stderr, "TDEStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii()); #endif continue; } -#endif //Q_WS_WIN +#endif //TQ_WS_WIN return *it; } } #ifndef NDEBUG if(false && strcmp(type, "locale")) - fprintf(stderr, "KStdDirs::findResDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type); + fprintf(stderr, "TDEStandardDirs::findResourceDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type); #endif return TQString::null; @@ -451,7 +451,7 @@ bool TDEStandardDirs::exists(const TQString &fullPath) { KDE_struct_stat buff; if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) { - if (fullPath.at(fullPath.length() - 1) != QChar('/')) { + if (fullPath.at(fullPath.length() - 1) != TQChar('/')) { if (S_ISREG( buff.st_mode )) return true; } @@ -480,10 +480,10 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, if (!dp) return; -#ifdef Q_WS_WIN - assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\')); +#ifdef TQ_WS_WIN + assert(path.at(path.length() - 1) == TQChar('/') || path.at(path.length() - 1) == TQChar('\\')); #else - assert(path.at(path.length() - 1) == QChar('/')); + assert(path.at(path.length() - 1) == TQChar('/')); #endif struct dirent *ep; @@ -508,7 +508,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, } if ( recursive ) { if ( S_ISDIR( buff.st_mode )) { - lookupDirectory(pathfn + QChar('/'), relPart + fn + QChar('/'), regexp, list, relList, recursive, unique); + lookupDirectory(pathfn + TQChar('/'), relPart + fn + TQChar('/'), regexp, list, relList, recursive, unique); } if (!regexp.exactMatch(fn)) continue; // No match @@ -560,7 +560,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (relpath.length()) { - int slash = relpath.find(QChar('/')); + int slash = relpath.find(TQChar('/')); if (slash < 0) rest = relpath.left(relpath.length() - 1); else { @@ -571,10 +571,10 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (prefix.isEmpty()) //for sanity return; -#ifdef Q_WS_WIN - assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\')); +#ifdef TQ_WS_WIN + assert(prefix.at(prefix.length() - 1) == TQChar('/') || prefix.at(prefix.length() - 1) == TQChar('\\')); #else - assert(prefix.at(prefix.length() - 1) == QChar('/')); + assert(prefix.at(prefix.length() - 1) == TQChar('/')); #endif KDE_struct_stat buff; @@ -594,7 +594,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~')) + if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == TQChar('~')) continue; if ( !pathExp.exactMatch(fn) ) @@ -606,15 +606,15 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, continue; // Couldn't stat (e.g. no permissions) } if ( S_ISDIR( buff.st_mode )) - lookupPrefix(fn + QChar('/'), rest, rfn + QChar('/'), regexp, list, relList, recursive, unique); + lookupPrefix(fn + TQChar('/'), rest, rfn + TQChar('/'), regexp, list, relList, recursive, unique); } closedir( dp ); } else { // Don't stat, if the dir doesn't exist we will find out // when we try to open it. - lookupPrefix(prefix + path + QChar('/'), rest, - relPart + path + QChar('/'), regexp, list, + lookupPrefix(prefix + path + TQChar('/'), rest, + relPart + path + TQChar('/'), regexp, list, relList, recursive, unique); } } @@ -754,7 +754,7 @@ void TDEStandardDirs::createSpecialResource(const char *type) } } } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (relink) { if (!makeDir(dir, 0700)) @@ -789,7 +789,7 @@ void TDEStandardDirs::createSpecialResource(const char *type) } } #endif - addResourceDir(type, dir+QChar('/')); + addResourceDir(type, dir+TQChar('/')); } TQStringList TDEStandardDirs::resourceDirs(const char *type) const @@ -904,9 +904,9 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr ) { p = tokens[ i ]; - if ( p[ 0 ] == QChar('~') ) + if ( p[ 0 ] == TQChar('~') ) { - int len = p.find( QChar('/') ); + int len = p.find( TQChar('/') ); if ( len == -1 ) len = p.length(); if ( len == 1 ) @@ -932,7 +932,7 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr ) TQString TDEStandardDirs::findExe( const TQString& appname, const TQString& pstr, bool ignore) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString real_appname = appname + ".exe"; #else TQString real_appname = appname; @@ -981,7 +981,7 @@ TQString TDEStandardDirs::findExe( const TQString& appname, int TDEStandardDirs::findAllExe( TQStringList& list, const TQString& appname, const TQString& pstr, bool ignore ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString real_appname = appname + ".exe"; #else TQString real_appname = appname; @@ -1072,7 +1072,7 @@ TQString TDEStandardDirs::kde_default(const char *type) { return "lib" KDELIBSUFF "/"; if (!strcmp(type, "module")) return "lib" KDELIBSUFF "/trinity/"; - if (!strcmp(type, "qtplugins")) + if (!strcmp(type, "tqtplugins")) return "lib" KDELIBSUFF "/trinity/plugins"; if (!strcmp(type, "xdgdata-apps")) return "applications/"; @@ -1183,8 +1183,8 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode) uint len = target.length(); // append trailing slash if missing - if (dir.at(len - 1) != QChar('/')) - target += QChar('/'); + if (dir.at(len - 1) != TQChar('/')) + target += TQChar('/'); TQString base(""); uint i = 1; @@ -1192,7 +1192,7 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode) while( i < len ) { KDE_struct_stat st; - int pos = target.find(QChar('/'), i); + int pos = target.find(TQChar('/'), i); base += target.mid(i - 1, pos - i + 1); TQCString baseEncoded = TQFile::encodeName(base); // bail out if we encountered a problem @@ -1259,7 +1259,7 @@ TQString TDEStandardDirs::kfsstnd_defaultprefix() TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self(); if (!s->defaultprefix.isEmpty()) return s->defaultprefix; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s->defaultprefix = readEnvPath("TDEDIR"); if (s->defaultprefix.isEmpty()) { s->defaultprefix = TQFile::decodeName("c:\\kde"); @@ -1279,7 +1279,7 @@ TQString TDEStandardDirs::kfsstnd_defaultbindir() TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self(); if (!s->defaultbindir.isEmpty()) return s->defaultbindir; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); #else //UNIX s->defaultbindir = __TDE_BINDIR; @@ -1340,15 +1340,15 @@ void TDEStandardDirs::addKDEDefaults() } if (!localKdeDir.isEmpty()) { - if (localKdeDir[localKdeDir.length()-1] != QChar('/')) - localKdeDir += QChar('/'); + if (localKdeDir[localKdeDir.length()-1] != TQChar('/')) + localKdeDir += TQChar('/'); } else { localKdeDir = TQDir::homeDirPath() + "/.trinity/"; } - if (localKdeDir != QString("-/")) + if (localKdeDir != TQString("-/")) { localKdeDir = KShell::tildeExpand(localKdeDir); addPrefix(localKdeDir); @@ -1374,7 +1374,7 @@ void TDEStandardDirs::addKDEDefaults() { xdgdirList.clear(); xdgdirList.append("/etc/xdg"); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN xdgdirList.append(kfsstnd_defaultprefix() + "/etc/xdg"); #else xdgdirList.append(KDESYSCONFDIR "/xdg"); @@ -1384,8 +1384,8 @@ void TDEStandardDirs::addKDEDefaults() TQString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); if (!localXdgDir.isEmpty()) { - if (localXdgDir[localXdgDir.length()-1] != QChar('/')) - localXdgDir += QChar('/'); + if (localXdgDir[localXdgDir.length()-1] != TQChar('/')) + localXdgDir += TQChar('/'); } else { @@ -1416,8 +1416,8 @@ void TDEStandardDirs::addKDEDefaults() it != tdedirList.end(); ++it) { TQString dir = *it; - if (dir[dir.length()-1] != QChar('/')) - dir += QChar('/'); + if (dir[dir.length()-1] != TQChar('/')) + dir += TQChar('/'); xdgdirList.append(dir+"share/"); } @@ -1428,8 +1428,8 @@ void TDEStandardDirs::addKDEDefaults() localXdgDir = readEnvPath("XDG_DATA_HOME"); if (!localXdgDir.isEmpty()) { - if (localXdgDir[localXdgDir.length()-1] != QChar('/')) - localXdgDir += QChar('/'); + if (localXdgDir[localXdgDir.length()-1] != TQChar('/')) + localXdgDir += TQChar('/'); } else { @@ -1487,7 +1487,7 @@ static TQStringList lookupProfiles(const TQString &mapFile) gid_t sup_gids[512]; int sup_gids_nr = getgroups(512, sup_gids); - KSimpleConfig mapCfg(mapFile, true); + TDESimpleConfig mapCfg(mapFile, true); mapCfg.setGroup("Users"); if (mapCfg.hasKey(user.data())) { diff --git a/tdecore/kstandarddirs.h b/tdecore/tdestandarddirs.h index 7cdf44e37..b221ecd41 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/tdestandarddirs.h @@ -1,5 +1,5 @@ /* - This file is part of the KDE libraries + This file is part of the TDE libraries Copyright (C) 1999 Sirtaj Singh Kang <taj@kde.org> Copyright (C) 1999 Stephan Kulow <coolo@kde.org> Copyright (C) 1999 Waldo Bastian <bastian@kde.org> @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef SSK_KSTDDIRS_H -#define SSK_KSTDDIRS_H +#ifndef _TDESTANDARDDIRS_H +#define _TDESTANDARDDIRS_H #include <tqstring.h> #include <tqdict.h> @@ -32,7 +32,7 @@ class TDEConfig; class TDEStandardDirsPrivate; /** - * @short Site-independent access to standard KDE directories. + * @short Site-independent access to standard TDE directories. * @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org> * * This is one of the most central classes in tdelibs as @@ -46,9 +46,9 @@ class TDEStandardDirsPrivate; * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world * the application would make no assumption where this file is and * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop") - * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop + * to apply this knowledge to return /opt/trinity/share/applnk/Home.desktop * or ::locate("data", "kgame/background.jpg") to return - * /opt/kde/share/apps/kgame/background.jpg + * /opt/trinity/share/apps/kgame/background.jpg * * The main idea behind TDEStandardDirs is that there are several * toplevel prefixes below which the files lie. One of these prefixes is @@ -70,7 +70,7 @@ class TDEStandardDirsPrivate; * * @li apps - Applications menu (.desktop files). * @li cache - Cached information (e.g. favicons, web-pages) - * @li cgi - CGIs to run from kdehelp. + * @li cgi - CGIs to run from tdehelp. * @li config - Configuration files. * @li data - Where applications store data. * @li exe - Executables in $prefix/bin. findExe() for a function that takes $PATH into account. @@ -80,7 +80,7 @@ class TDEStandardDirsPrivate; * @li locale - Translation files for TDELocale. * @li mime - Mime types. * @li module - Module (dynamically loaded library). - * @li qtplugins - Qt plugins (dynamically loaded objects for Qt) + * @li tqtplugins - TQt plugins (dynamically loaded objects for TQt) * @li services - Services. * @li servicetypes - Service types. * @li scripts - Application scripting additions. @@ -116,7 +116,7 @@ class TDEStandardDirsPrivate; * used to search for resources first. If TDEHOME is not * specified it defaults to "$HOME/.trinity" * @li TDEROOTHOME: Like TDEHOME, but used for the root user. - * If TDEROOTHOME is not set it defaults to the .kde directory in the + * If TDEROOTHOME is not set it defaults to the .trinity directory in the * home directory of root, usually "/root/.trinity". * Note that the setting of $HOME is ignored in this case. * @@ -140,7 +140,7 @@ public: * * @li When compiling tdelibs, the prefix is added to this. * @li TDEDIRS or TDEDIR is taking into account - * @li Additional dirs may be loaded from kdeglobals. + * @li Additional dirs may be loaded from tdeglobals. * * @param dir The directory to append relative paths to. */ @@ -169,7 +169,7 @@ public: * * You may add as many as you need, but it is advised that there * is exactly one to make writing definite. - * All basic types ( kde_default) are added by addKDEDefaults(), + * All basic types (kde_default) are added by addKDEDefaults(), * but for those you can add more relative paths as well. * * The later a suffix is added, the higher its priority. Note, that the @@ -214,7 +214,7 @@ public: * to findResource("lib", "libtdecore.la"). TDEStandardDirs will * then look into the subdir lib of all elements of all prefixes * ($TDEDIRS) for a file libtdecore.la and return the path to - * the first one it finds (e.g. /opt/kde/lib/libtdecore.la) + * the first one it finds (e.g. /opt/trinity/lib/libtdecore.la) * * @param type The type of the wanted resource * @param filename A relative filename of the resource. @@ -262,7 +262,7 @@ public: * Tries to find all directories whose names consist of the * specified type and a relative path. So would * findDirs("apps", "Settings") return - * @li /opt/kde/share/applnk/Settings/ + * @li /opt/trinity/share/applnk/Settings/ * @li /home/joe/.trinity/share/applnk/Settings/ * * Note that it appends / to the end of the directories, @@ -288,7 +288,7 @@ public: * * findResourceDir("lib", "libtdecore.la") would return the * path of the subdir libtdecore.la is found first in - * (e.g. /opt/kde/lib/) + * (e.g. /opt/trinity/lib/) * * @param type The type of the wanted resource * @param filename A relative filename of the resource. @@ -409,7 +409,7 @@ public: /** * This function adds the defaults that are used by the current - * KDE version. + * TDE version. * * It's a series of addResourceTypes() * and addPrefix() calls. @@ -446,7 +446,7 @@ public: * This function will return a list of all the types that TDEStandardDirs * supports. * - * @return All types that KDE supports + * @return All types that TDE supports */ TQStringList allTypes() const; @@ -501,7 +501,7 @@ public: static bool makeDir(const TQString& dir, int mode = 0755); /** - * This returns a default relative path for the standard KDE + * This returns a default relative path for the standard TDE * resource types. Below is a list of them so you get an idea * of what this is all about. * @@ -554,13 +554,13 @@ public: /** * @internal - * Returns the default toplevel directory where KDE is installed. + * Returns the default toplevel directory where TDE is installed. */ static TQString kfsstnd_defaultprefix(); /** * @internal - * Returns the default bin directory in which KDE executables are stored. + * Returns the default bin directory in which TDE executables are stored. */ static TQString kfsstnd_defaultbindir(); @@ -649,12 +649,12 @@ public: * @{ * On The Usage Of 'locate' and 'locateLocal' * - * Typical KDE applications use resource files in one out of + * Typical TDE applications use resource files in one out of * three ways: * * 1) A resource file is read but is never written. A system * default is supplied but the user can override this - * default in his local .kde directory: + * default in his local .trinity directory: * * \code * // Code example @@ -665,7 +665,7 @@ public: * 2) A resource file is read and written. If the user has no * local version of the file the system default is used. * The resource file is always written to the users local - * .kde directory. + * .trinity directory. * * \code * // Code example @@ -681,7 +681,7 @@ public: * 3) A resource file is read and written. No system default * is used if the user has no local version of the file. * The resource file is always written to the users local - * .kde directory. + * .trinity directory. * * \code * // Code example @@ -726,4 +726,4 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, /*! @} */ -#endif // SSK_KSTDDIRS_H +#endif // _TDESTANDARDDIRS_H diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index 77b979edb..e34964c25 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -33,8 +33,8 @@ DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include "config.h" -#ifdef Q_WS_X11 -//#ifdef Q_WS_X11 // FIXME(E): Re-implement in a less X11 specific way +#ifdef TQ_WS_X11 +//#ifdef TQ_WS_X11 // FIXME(E): Re-implement in a less X11 specific way #include <tqglobal.h> #ifdef HAVE_CONFIG_H #include <config.h> @@ -46,13 +46,13 @@ DEALINGS IN THE SOFTWARE. #include <sys/time.h> #include <stdlib.h> #include <tqtimer.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <netwm.h> #endif #include <kdebug.h> #include <tdeapplication.h> #include <signal.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twinmodule.h> #include <kxmessages.h> #include <twin.h> @@ -93,7 +93,7 @@ struct TDEStartupInfoPrivate TQMap< TDEStartupInfoId, TDEStartupInfo::Data > silent_startups; // contains ASN's that had change: but no new: yet TQMap< TDEStartupInfoId, TDEStartupInfo::Data > uninited_startups; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWinModule* wm_module; KXMessages msgs; #endif @@ -101,7 +101,7 @@ struct TDEStartupInfoPrivate int flags; TDEStartupInfoPrivate( int flags_P ) : -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 msgs( NET_STARTUP_MSG, NULL, false ), #endif flags( flags_P ) {} @@ -124,25 +124,25 @@ TDEStartupInfo::TDEStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, void TDEStartupInfo::init( int flags_P ) { // d == NULL means "disabled" - if( !TDEApplication::kApplication()) + if( !tdeApp) return; - if( !TDEApplication::kApplication()->getDisplay()) + if( !tdeApp->getDisplay()) return; d = new TDEStartupInfoPrivate( flags_P ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !( d->flags & DisableKWinModule )) { d->wm_module = new KWinModule( this ); - connect( d->wm_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); - connect( d->wm_module, TQT_SIGNAL( systemTrayWindowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( systemTrayWindowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); } else d->wm_module = NULL; - connect( &d->msgs, TQT_SIGNAL( gotMessage( const TQString& )), TQT_SLOT( got_message( const TQString& ))); + connect( &d->msgs, TQ_SIGNAL( gotMessage( const TQString& )), TQ_SLOT( got_message( const TQString& ))); #endif d->cleanup = new TQTimer( this, "cleanup" ); - connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup())); + connect( d->cleanup, TQ_SIGNAL( timeout()), TQ_SLOT( startups_cleanup())); } TDEStartupInfo::~TDEStartupInfo() @@ -183,7 +183,7 @@ class DelayedWindowEvent void TDEStartupInfo::slot_window_added( WId w_P ) { - kapp->postEvent( this, new DelayedWindowEvent( w_P )); + tdeApp->postEvent( this, new DelayedWindowEvent( w_P )); } void TDEStartupInfo::customEvent( TQCustomEvent* e_P ) @@ -489,8 +489,8 @@ bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P, void TDEStartupInfo::appStarted() { - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - appStarted( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + appStarted( tdeApp->startupId()); else appStarted( TDEStartupInfo::currentStartupIdEnv().id()); } @@ -501,11 +501,11 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id ) id.initId( startup_id ); if( id.none()) return; - if( kapp != NULL ) + if( tdeApp != NULL ) TDEStartupInfo::sendFinish( id ); else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display* disp = XOpenDisplay( NULL ); if( disp != NULL ) { @@ -524,7 +524,7 @@ void TDEStartupInfo::disableAutoAppStartedSending( bool disable ) void TDEStartupInfo::silenceStartup( bool silence ) { TDEStartupInfoId id; - id.initId( kapp->startupId()); + id.initId( tdeApp->startupId()); if( id.none()) return; TDEStartupInfoData data; @@ -541,7 +541,7 @@ void TDEStartupInfo::handleAutoAppStartedSending() void TDEStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id ) { bool activate = true; - kapp->setStartupId( startup_id ); + tdeApp->setStartupId( startup_id ); if( window != NULL ) { if( !startup_id.isEmpty() && startup_id != "0" ) @@ -612,7 +612,7 @@ TDEStartupInfo::startup_t TDEStartupInfo::check_startup_internal( WId w_P, TDESt } return find_id( id, id_O, data_O ) ? Match : NoMatch; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), w_P, tqt_xrootwin(), NET::WMWindowType | NET::WMPid | NET::WMState ); pid_t pid = info.pid(); @@ -729,7 +729,7 @@ bool TDEStartupInfo::find_wclass( TQCString res_name, TQCString res_class, return false; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static Atom net_startup_atom = None; static TQCString read_startup_id_property( WId w_P ) @@ -755,7 +755,7 @@ static TQCString read_startup_id_property( WId w_P ) TQCString TDEStartupInfo::windowStartupId( WId w_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( net_startup_atom == None ) net_startup_atom = XInternAtom( tqt_xdisplay(), NET_STARTUP_WINDOW, False ); if( utf8_string_atom == None ) @@ -777,7 +777,7 @@ TQCString TDEStartupInfo::windowStartupId( WId w_P ) void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( id_P.isNull()) return; if( net_startup_atom == None ) @@ -791,7 +791,7 @@ void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P ) TQCString TDEStartupInfo::get_window_hostname( WId w_P ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XTextProperty tp; char** hh; int cnt; @@ -815,7 +815,7 @@ void TDEStartupInfo::setTimeout( unsigned int secs_P ) { timeout = secs_P; // schedule removing entries that are older than the new timeout - TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age())); + TQTimer::singleShot( 0, this, TQ_SLOT( startups_cleanup_no_age())); } void TDEStartupInfo::startups_cleanup_no_age() @@ -930,7 +930,7 @@ TQCString TDEStartupInfo::createNewStartupId() if (!gethostname( hostname, 255 )) hostname[sizeof(hostname)-1] = '\0'; TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec ) - .arg( tm.tv_usec ).arg( getpid()).arg( GET_QT_X_USER_TIME() )).utf8(); + .arg( tm.tv_usec ).arg( getpid()).arg( get_tqt_x_user_time() )).utf8(); kdDebug( 172 ) << "[tdecore-tdestartupinfo] creating: " << id << ":" << tqAppName() << endl; return id; } @@ -1130,9 +1130,9 @@ TQString TDEStartupInfoData::to_text() const ret += TQString::fromLatin1( " DESKTOP=%1" ) .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0 if( !d->wmclass.isEmpty()) - ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); + ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( TQString(d->wmclass) ); if( !d->hostname.isEmpty()) - ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); + ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( TQString(d->hostname) ); for( TQValueList< pid_t >::ConstIterator it = d->pids.begin(); it != d->pids.end(); ++it ) @@ -1456,7 +1456,7 @@ static TQString get_str( const TQString& item_P ) { unsigned int pos = item_P.find( '=' ); - if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' ) + if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (TQChar)'\"' ) { int pos2 = item_P.left( pos + 2 ).find( '\"' ); if( pos2 < 0 ) @@ -1512,8 +1512,8 @@ static TQString escape_str( const TQString& str_P ) pos < str_P.length(); ++pos ) { - if( str_P[ pos ] == (QChar)'\\' - || str_P[ pos ] == (QChar)'"' ) + if( str_P[ pos ] == (TQChar)'\\' + || str_P[ pos ] == (TQChar)'"' ) ret += '\\'; ret += str_P[ pos ]; } diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h index 9fa57cd4b..bf507c026 100644 --- a/tdecore/tdestartupinfo.h +++ b/tdecore/tdestartupinfo.h @@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <sys/types.h> #include <tqobject.h> -#ifdef Q_MOC_RUN -#define Q_WS_X11 -#endif // Q_MOC_RUN - -#ifdef Q_WS_X11 // FIXME(E): Redo in a less X11-specific way +#ifdef TQ_WS_X11 // FIXME(E): Redo in a less X11-specific way #include <tqcstring.h> #include <tqstring.h> @@ -67,7 +63,7 @@ class TDEStartupInfoPrivate; class TDECORE_EXPORT TDEStartupInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -98,7 +94,7 @@ class TDECORE_EXPORT TDEStartupInfo /** * Use this function if the application got a request with startup - * notification from outside (for example, when KUniqueApplication::newInstance() + * notification from outside (for example, when TDEUniqueApplication::newInstance() * is called, or e.g. when khelpcenter opens new URL in its window). * The window can be either an already existing and visible window, * or a new one, before being shown. Note that this function is usually @@ -692,6 +688,6 @@ class TDECORE_EXPORT TDEStartupInfoData TDEStartupInfoDataPrivate* d; }; -#endif //Q_WS_X11 +#endif //TQ_WS_X11 #endif diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp index ba3e64ca5..b26948fd0 100644 --- a/tdecore/tdestdaccel.cpp +++ b/tdecore/tdestdaccel.cpp @@ -50,59 +50,59 @@ struct TDEStdAccelInfo static TDEStdAccelInfo g_infoStdAccel[] = { {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false }, - { Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false }, - { New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false }, - { Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false }, - { Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false }, - { Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false }, - { Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false }, + { Open, I18N_NOOP("Open"), 0, TQt::CTRL+TQt::Key_O, 0, 0, 0, TDEShortcut(), false }, + { New, I18N_NOOP("New"), 0, TQt::CTRL+TQt::Key_N, 0, 0, 0, TDEShortcut(), false }, + { Close, I18N_NOOP("Close"), 0, TQt::CTRL+TQt::Key_W, TQt::CTRL+TQt::Key_Escape, 0, TQt::CTRL+TQt::Key_W, TDEShortcut(), false }, + { Save, I18N_NOOP("Save"), 0, TQt::CTRL+TQt::Key_S, 0, 0, 0, TDEShortcut(), false }, + { Print, I18N_NOOP("Print"), 0, TQt::CTRL+TQt::Key_P, 0, 0, 0, TDEShortcut(), false }, + { Quit, I18N_NOOP("Quit"), 0, TQt::CTRL+TQt::Key_Q, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false }, - { Undo, I18N_NOOP("Undo"), 0, Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, - { Redo, I18N_NOOP("Redo"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false }, - { Cut, I18N_NOOP("Cut"), 0, Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false }, - { Copy, I18N_NOOP("Copy"), 0, Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false }, - { Paste, I18N_NOOP("Paste"), 0, Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, - { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false }, - { SelectAll, "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, - { Deselect, I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false }, - { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false }, - { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0, 0, 0, TDEShortcut(), false }, - { Find, I18N_NOOP("Find"), 0, Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, - { FindNext, "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, - { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false }, - { Replace, I18N_NOOP("Replace"), 0, Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false }, + { Undo, I18N_NOOP("Undo"), 0, TQt::CTRL+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false }, + { Redo, I18N_NOOP("Redo"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false }, + { Cut, I18N_NOOP("Cut"), 0, TQt::CTRL+TQt::Key_X, 0, TQt::SHIFT+TQt::Key_Delete, 0, TDEShortcut(), false }, + { Copy, I18N_NOOP("Copy"), 0, TQt::CTRL+TQt::Key_C, 0, TQt::CTRL+TQt::Key_Insert, 0, TDEShortcut(), false }, + { Paste, I18N_NOOP("Paste"), 0, TQt::CTRL+TQt::Key_V, 0, TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false }, + { PasteSelection, I18N_NOOP("Paste Selection"), 0, 0, 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false }, + { SelectAll, "SelectAll", I18N_NOOP("Select All"), TQt::CTRL+TQt::Key_A, 0, 0, 0, TDEShortcut(), false }, + { Deselect, I18N_NOOP("Deselect"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_A, 0, 0, 0, TDEShortcut(), false }, + { DeleteWordBack, "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), TQt::CTRL+TQt::Key_Backspace, 0, 0, 0, TDEShortcut(), false }, + { DeleteWordForward, "DeleteWordForward", I18N_NOOP("Delete Word Forward"), TQt::CTRL+TQt::Key_Delete, 0, 0, 0, TDEShortcut(), false }, + { Find, I18N_NOOP("Find"), 0, TQt::CTRL+TQt::Key_F, 0, 0, 0, TDEShortcut(), false }, + { FindNext, "FindNext", I18N_NOOP("Find Next"), TQt::Key_F3, 0, 0, 0, TDEShortcut(), false }, + { FindPrev, "FindPrev", I18N_NOOP("Find Prev"), TQt::SHIFT+TQt::Key_F3, 0, 0, 0, TDEShortcut(), false }, + { Replace, I18N_NOOP("Replace"), 0, TQt::CTRL+TQt::Key_R, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false }, - { Home, I18N_NOOP2("Opposite to End","Home"), 0, Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false }, - { End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false }, - { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false}, - { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false}, + { Home, I18N_NOOP2("Opposite to End","Home"), 0, TQt::CTRL+TQt::Key_Home, 0, TQt::Key_HomePage, 0, TDEShortcut(), false }, + { End, I18N_NOOP("End"), 0, TQt::CTRL+TQt::Key_End, 0, 0, 0, TDEShortcut(), false }, + { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), TQt::Key_Home, 0, 0, 0, TDEShortcut(), false}, + { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), TQt::Key_End, 0, 0, 0, TDEShortcut(), false}, { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false }, { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, TDEShortcut(), false }, - { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false }, - { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false }, - { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false }, - { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false }, - { Up, I18N_NOOP("Up"), 0, Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { Back, I18N_NOOP("Back"), 0, Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false }, - { Forward, I18N_NOOP("Forward"), 0, Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false }, - { Reload, I18N_NOOP("Reload"), 0, Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false }, - { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false }, - { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false }, - { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false }, - { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false }, - { TabNext, I18N_NOOP("Activate Next Tab"), 0, Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false }, - { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false }, - { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false }, + { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), TQt::CTRL+TQt::Key_G, 0, 0, 0, TDEShortcut(), false }, + { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), TQt::CTRL+TQt::Key_B, 0, 0, 0, TDEShortcut(), false }, + { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), TQt::CTRL+TQt::Key_Plus, 0, 0, 0, TDEShortcut(), false }, + { ZoomOut, "ZoomOut", I18N_NOOP("Zoom Out"), TQt::CTRL+TQt::Key_Minus, 0, 0, 0, TDEShortcut(), false }, + { Up, I18N_NOOP("Up"), 0, TQt::ALT+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { Back, I18N_NOOP("Back"), 0, TQt::ALT+TQt::Key_Left, 0, TQt::Key_Back, 0, TDEShortcut(), false }, + { Forward, I18N_NOOP("Forward"), 0, TQt::ALT+TQt::Key_Right, 0, TQt::Key_Forward, 0, TDEShortcut(), false }, + { Reload, I18N_NOOP("Reload"), 0, TQt::Key_F5, 0, TQt::Key_Refresh, 0, TDEShortcut(), false }, + { PopupMenuContext, "PopupMenuContext", I18N_NOOP("Popup Menu Context"), TQt::Key_Menu, 0, 0, 0, TDEShortcut(), false }, + { ShowMenubar, "ShowMenubar", I18N_NOOP("Show Menu Bar"), TQt::CTRL+TQt::Key_M, 0, 0, 0, TDEShortcut(), false }, + { BackwardWord, "BackwardWord", I18N_NOOP("Backward Word"), TQt::CTRL+TQt::Key_Left, 0, 0, 0, TDEShortcut(), false }, + { ForwardWord, "ForwardWord", I18N_NOOP("Forward Word"), TQt::CTRL+TQt::Key_Right, 0, 0, 0, TDEShortcut(), false }, + { TabNext, I18N_NOOP("Activate Next Tab"), 0, TQt::CTRL+TQt::Key_Period, 0, TQt::CTRL+TQt::Key_BracketRight, 0, TDEShortcut(), false }, + { TabPrev, I18N_NOOP("Activate Previous Tab"), 0, TQt::CTRL+TQt::Key_Comma, 0, TQt::CTRL+TQt::Key_BracketLeft, 0, TDEShortcut(), false }, + { FullScreen, "FullScreen", I18N_NOOP("Full Screen Mode"), TQt::CTRL+TQt::SHIFT+TQt::Key_F, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false }, - { Help, I18N_NOOP("Help"), 0, Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, - { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false }, + { Help, I18N_NOOP("Help"), 0, TQt::Key_F1, 0, 0, 0, TDEShortcut(), false }, + { WhatsThis, "WhatsThis", I18N_NOOP("What's This"), TQt::SHIFT+TQt::Key_F1, 0, 0, 0, TDEShortcut(), false }, {AccelNone, "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false }, - { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false }, - { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, - { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false }, - { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false }, - { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false }, + { TextCompletion, "TextCompletion", I18N_NOOP("Text Completion"), TQt::CTRL+TQt::Key_E, 0, 0, 0, TDEShortcut(), false }, + { PrevCompletion, "PrevCompletion", I18N_NOOP("Previous Completion Match"), TQt::CTRL+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { NextCompletion, "NextCompletion", I18N_NOOP("Next Completion Match"), TQt::CTRL+TQt::Key_Down, 0, 0, 0, TDEShortcut(), false }, + { SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), TQt::CTRL+TQt::Key_T, 0, 0, 0, TDEShortcut(), false }, + { RotateUp, "RotateUp", I18N_NOOP("Previous Item in List"), TQt::Key_Up, 0, 0, 0, TDEShortcut(), false }, + { RotateDown, "RotateDown", I18N_NOOP("Next Item in List"), TQt::Key_Down, 0, 0, 0, TDEShortcut(), false }, { AccelNone, 0, 0, 0, 0, 0, 0, TDEShortcut(), false } }; diff --git a/tdecore/tdestdaccel.h b/tdecore/tdestdaccel.h index e39b090b9..735c11dd0 100644 --- a/tdecore/tdestdaccel.h +++ b/tdecore/tdestdaccel.h @@ -452,22 +452,22 @@ namespace TDEStdAccel * @deprecated * Obsolete. Use name(). Returns a string representation for @p accel. */ - TDECORE_EXPORT TQString action(StdAccel id) KDE_DEPRECATED; + TDECORE_EXPORT TQString action(StdAccel id) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use desc(). Returns a localized description of @p accel. */ - TDECORE_EXPORT TQString description(StdAccel id) KDE_DEPRECATED; + TDECORE_EXPORT TQString description(StdAccel id) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use shortcut(). Returns the keybinding for @p accel. */ - TDECORE_EXPORT int key(StdAccel) KDE_DEPRECATED; + TDECORE_EXPORT int key(StdAccel) TDE_DEPRECATED; /** * @deprecated * Obsolete. Use shortcutDefault(). */ - TDECORE_EXPORT int defaultKey(StdAccel accel) KDE_DEPRECATED; + TDECORE_EXPORT int defaultKey(StdAccel accel) TDE_DEPRECATED; /** * @deprecated. Use KKey(const TQKeyEvent*) == KKey(int). @@ -484,7 +484,7 @@ namespace TDEStdAccel * * @return true if the int value matches the integer representation of the QKeyEvent */ - TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) KDE_DEPRECATED; + TDECORE_EXPORT bool isEqual(const TQKeyEvent* pEvent, int keyQt) TDE_DEPRECATED; #endif // !KDE_NO_COMPAT } diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp index a11175117..80764faec 100644 --- a/tdecore/tdesycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -30,8 +30,8 @@ #include <dcopclient.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <assert.h> #include <stdlib.h> @@ -42,7 +42,7 @@ #include <sys/mman.h> #endif -#ifdef Q_OS_SOLARIS +#if defined(Q_OS_SOLARIS) && !defined(__dilos__) extern "C" { extern int madvise(caddr_t, size_t, int); @@ -92,9 +92,9 @@ KSycoca::KSycoca() { d = new KSycocaPrivate; // Register app as able to receive DCOP messages - if (kapp && !kapp->dcopClient()->isAttached()) + if (tdeApp && !tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } // We register with DCOP _before_ we try to open the database. // This way we can be relative sure that the KDE framework is @@ -228,7 +228,7 @@ KSycoca::~KSycoca() void KSycoca::closeDatabase() { - QIODevice *device = 0; + TQIODevice *device = 0; if (m_str) device = m_str->device(); #ifdef HAVE_MMAP @@ -246,7 +246,7 @@ void KSycoca::closeDatabase() delete m_str; m_str = 0; delete device; - if (TQT_TQIODEVICE(d->database) != device) + if (d->database != device) delete d->database; if (m_barray) delete m_barray; m_barray = 0; diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h index f8e2274e0..a96bd9d9f 100644 --- a/tdecore/tdesycoca.h +++ b/tdecore/tdesycoca.h @@ -43,7 +43,7 @@ class KSycocaFactoryList; */ class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP protected: diff --git a/tdecore/tdetempfile.cpp b/tdecore/tdetempfile.cpp index 805d315a1..4f6dade45 100644 --- a/tdecore/tdetempfile.cpp +++ b/tdecore/tdetempfile.cpp @@ -50,9 +50,9 @@ #include "tdeglobal.h" #include "tdeapplication.h" -#include "kinstance.h" +#include "tdeinstance.h" #include "tdetempfile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kde_file.h" #include "kdebug.h" diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp index 12c9c1297..85904a622 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/tdeuniqueapplication.cpp @@ -35,36 +35,36 @@ #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <twin.h> #include <tdestartupinfo.h> #endif #include <tdeconfig.h> #include "kdebug.h" -#include "kuniqueapplication.h" +#include "tdeuniqueapplication.h" -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <netwm.h> #include <X11/Xlib.h> #define DISPLAY "DISPLAY" #else -# ifdef Q_WS_QWS +# ifdef TQ_WS_QWS # define DISPLAY "QWS_DISPLAY" # else # define DISPLAY "DISPLAY" # endif #endif -bool KUniqueApplication::s_nofork = false; -bool KUniqueApplication::s_multipleInstances = false; -bool KUniqueApplication::s_uniqueTestDone = false; -bool KUniqueApplication::s_handleAutoStarted = false; +bool TDEUniqueApplication::s_nofork = false; +bool TDEUniqueApplication::s_multipleInstances = false; +bool TDEUniqueApplication::s_uniqueTestDone = false; +bool TDEUniqueApplication::s_handleAutoStarted = false; -static TDECmdLineOptions kunique_options[] = +static TDECmdLineOptions tdeunique_options[] = { { "nofork", "Don't run in the background.", 0 }, TDECmdLineLastOption @@ -76,7 +76,7 @@ struct DCOPRequest { DCOPClientTransaction *transaction; }; -class KUniqueApplicationPrivate { +class TDEUniqueApplicationPrivate { public: TQPtrList <DCOPRequest> requestList; bool processingRequest; @@ -84,22 +84,22 @@ public: }; void -KUniqueApplication::addCmdLineOptions() +TDEUniqueApplication::addCmdLineOptions() { - TDECmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" ); + TDECmdLineArgs::addCmdLineOptions(tdeunique_options, 0, "tdeuniqueapp", "tde" ); } bool -KUniqueApplication::start() +TDEUniqueApplication::start() { if( s_uniqueTestDone ) return true; s_uniqueTestDone = true; addCmdLineOptions(); // Make sure to add cmd line options -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN s_nofork = true; #else - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("kuniqueapp"); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tdeuniqueapp"); s_nofork = !args->isSet("fork"); delete args; #endif @@ -118,11 +118,11 @@ KUniqueApplication::start() // Check to make sure that we're actually able to register with the DCOP // server. -#ifndef Q_WS_WIN //TODO +#ifndef TQ_WS_WIN //TODO if(dcopClient()->registerAs(appName, false).isEmpty()) { startKdeinit(); if(dcopClient()->registerAs(appName, false).isEmpty()) { - kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl; + kdError() << "TDEUniqueApplication: Can't setup DCOP communication." << endl; ::exit(255); } } @@ -136,13 +136,13 @@ KUniqueApplication::start() signed char result; if (0 > pipe(fd)) { - kdError() << "KUniqueApplication: pipe() failed!" << endl; + kdError() << "TDEUniqueApplication: pipe() failed!" << endl; ::exit(255); } int fork_result = fork(); switch(fork_result) { case -1: - kdError() << "KUniqueApplication: fork() failed!" << endl; + kdError() << "TDEUniqueApplication: fork() failed!" << endl; ::exit(255); break; case 0: @@ -158,7 +158,7 @@ KUniqueApplication::start() // Check DISPLAY if (TQCString(getenv(DISPLAY)).isEmpty()) { - kdError() << "KUniqueApplication: Can't determine DISPLAY. Aborting." << endl; + kdError() << "TDEUniqueApplication: Can't determine DISPLAY. Aborting." << endl; result = -1; // Error ::write(fd[1], &result, 1); ::exit(255); @@ -169,7 +169,7 @@ KUniqueApplication::start() regName = dc->registerAs(appName, false); if (regName.isEmpty()) { - kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl; + kdError() << "TDEUniqueApplication: Can't setup DCOP communication." << endl; result = -1; delete dc; // Clean up DCOP commmunication ::write(fd[1], &result, 1); @@ -184,11 +184,11 @@ KUniqueApplication::start() ::write(fd[1], &result, 1); ::close(fd[1]); #if 0 -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // say we're up and running ( probably no new window will appear ) TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -209,10 +209,10 @@ KUniqueApplication::start() } { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -246,12 +246,12 @@ KUniqueApplication::start() if (n == 1) break; if (n == 0) { - kdError() << "KUniqueApplication: Pipe closed unexpectedly." << endl; + kdError() << "TDEUniqueApplication: Pipe closed unexpectedly." << endl; ::exit(255); } if (errno != EINTR) { - kdError() << "KUniqueApplication: Error reading from pipe." << endl; + kdError() << "TDEUniqueApplication: Error reading from pipe." << endl; ::exit(255); } } @@ -263,19 +263,19 @@ KUniqueApplication::start() dc = new DCOPClient(); if (!dc->attach()) { - kdError() << "KUniqueApplication: Parent process can't attach to DCOP." << endl; + kdError() << "TDEUniqueApplication: Parent process can't attach to DCOP." << endl; delete dc; // Clean up DCOP commmunication ::exit(255); } if (!dc->isApplicationRegistered(appName)) { - kdError() << "KUniqueApplication: Registering failed!" << endl; + kdError() << "TDEUniqueApplication: Registering failed!" << endl; } TQCString new_asn_id; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -299,7 +299,7 @@ KUniqueApplication::start() dc->setPriorityCall(false); if (replyType != "int") { - kdError() << "KUniqueApplication: DCOP communication error!" << endl; + kdError() << "TDEUniqueApplication: DCOP communication error!" << endl; delete dc; // Clean up DCOP commmunication ::exit(255); } @@ -314,54 +314,54 @@ KUniqueApplication::start() } -KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique) +TDEUniqueApplication::TDEUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique) : TDEApplication( allowStyles, GUIenabled, initHack( configUnique )), DCOPObject(TDECmdLineArgs::about->appName()) { - d = new KUniqueApplicationPrivate; + d = new TDEUniqueApplicationPrivate; d->processingRequest = false; d->firstInstance = true; if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } -#ifdef Q_WS_X11 -KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual, - Qt::HANDLE colormap, bool allowStyles, bool configUnique) +#ifdef TQ_WS_X11 +TDEUniqueApplication::TDEUniqueApplication(Display *display, TQt::HANDLE visual, + TQt::HANDLE colormap, bool allowStyles, bool configUnique) : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )), DCOPObject(TDECmdLineArgs::about->appName()) { - d = new KUniqueApplicationPrivate; + d = new TDEUniqueApplicationPrivate; d->processingRequest = false; d->firstInstance = true; if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } #endif -KUniqueApplication::~KUniqueApplication() +TDEUniqueApplication::~TDEUniqueApplication() { delete d; } // this gets called before even entering TQApplication::TQApplication() -TDEInstance* KUniqueApplication::initHack( bool configUnique ) +TDEInstance* TDEUniqueApplication::initHack( bool configUnique ) { TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about ); if (configUnique) @@ -375,19 +375,19 @@ TDEInstance* KUniqueApplication::initHack( bool configUnique ) return inst; } -void KUniqueApplication::newInstanceNoFork() +void TDEUniqueApplication::newInstanceNoFork() { if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(newInstanceNoFork()) ); return; } s_handleAutoStarted = false; newInstance(); d->firstInstance = false; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // KDE4 remove // A hack to make startup notification stop for apps which override newInstance() // and reuse an already existing window there, but use KWin::activateWindow() @@ -400,7 +400,7 @@ void KUniqueApplication::newInstanceNoFork() // What to do with the return value ? } -bool KUniqueApplication::process(const TQCString &fun, const TQByteArray &data, +bool TDEUniqueApplication::process(const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData) { if (fun == "newInstance()") @@ -412,7 +412,7 @@ bool KUniqueApplication::process(const TQCString &fun, const TQByteArray &data, } void -KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data) +TDEUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data) { DCOPRequest *request = new DCOPRequest; request->fun = fun; @@ -421,17 +421,17 @@ KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data) d->requestList.append(request); if (!d->processingRequest) { - TQTimer::singleShot(0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(processDelayed())); } } void -KUniqueApplication::processDelayed() +TDEUniqueApplication::processDelayed() { if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 200, this, TQ_SLOT(processDelayed())); return; } d->processingRequest = true; @@ -453,7 +453,7 @@ KUniqueApplication::processDelayed() s_handleAutoStarted = false; int exitCode = newInstance(); d->firstInstance = false; -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( s_handleAutoStarted ) TDEStartupInfo::handleAutoAppStartedSending(); // KDE4 remove? #endif @@ -468,12 +468,12 @@ KUniqueApplication::processDelayed() d->processingRequest = false; } -bool KUniqueApplication::restoringSession() +bool TDEUniqueApplication::restoringSession() { return d->firstInstance && isRestored(); } -int KUniqueApplication::newInstance() +int TDEUniqueApplication::newInstance() { if (!d->firstInstance) { @@ -481,25 +481,25 @@ int KUniqueApplication::newInstance() if ( mainWidget() ) { mainWidget()->show(); -#if defined Q_WS_X11 +#if defined TQ_WS_X11 // This is the line that handles window activation if necessary, // and what's important, it does it properly. If you reimplement newInstance(), // and don't call the inherited one, use this (but NOT when newInstance() // is called for the first time, like here). - TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); + TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId()); #endif } } return 0; // do nothing in default implementation } -void KUniqueApplication::setHandleAutoStarted() +void TDEUniqueApplication::setHandleAutoStarted() { s_handleAutoStarted = false; } -void KUniqueApplication::virtual_hook( int id, void* data ) +void TDEUniqueApplication::virtual_hook( int id, void* data ) { TDEApplication::virtual_hook( id, data ); DCOPObject::virtual_hook( id, data ); } -#include "kuniqueapplication.moc" +#include "tdeuniqueapplication.moc" diff --git a/tdecore/kuniqueapplication.h b/tdecore/tdeuniqueapplication.h index 3b7bd8d6e..2334708bc 100644 --- a/tdecore/kuniqueapplication.h +++ b/tdecore/tdeuniqueapplication.h @@ -18,13 +18,13 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KUNIQUEAPP_H -#define _KUNIQUEAPP_H +#ifndef _TDEUNIQUEAPP_H +#define _TDEUNIQUEAPP_H #include <tdeapplication.h> #include <dcopobject.h> -class KUniqueApplicationPrivate; +class TDEUniqueApplicationPrivate; /** * Maintains only a single @@ -45,9 +45,9 @@ class KUniqueApplicationPrivate; * @see TDEApplication DCOPObject * @author Preston Brown <pbrown@kde.org> */ -class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject +class TDECORE_EXPORT TDEUniqueApplication : public TDEApplication, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor. Takes command line arguments from TDECmdLineArgs @@ -64,11 +64,11 @@ public: * depend on the value of the "MultipleInstances" * key in the "KDE" group of the application config file. */ - KUniqueApplication( bool allowStyles=true, + TDEUniqueApplication( bool allowStyles=true, bool GUIenabled=true, bool configUnique=false); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /** * Constructor. Takes command line arguments from TDECmdLineArgs * @@ -89,17 +89,17 @@ public: * key in the "KDE" group of the application config file. * @since KDE 3.3 */ - KUniqueApplication( Display *display, - Qt::HANDLE visual=0, - Qt::HANDLE colormap=0, + TDEUniqueApplication( Display *display, + TQt::HANDLE visual=0, + TQt::HANDLE colormap=0, bool allowStyles=true, bool configUnique=false); #endif /** - * Adds command line options specific for KUniqueApplication. + * Adds command line options specific for TDEUniqueApplication. * - * Should be called before calling KUniqueApplication constructor + * Should be called before calling TDEUniqueApplication constructor * and / or start(). */ static void addCmdLineOptions(); @@ -116,18 +116,18 @@ public: * TDEAboutData about("myappname", "myAppName", .....); * TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::addCmdLineOptions( myCmdOptions ); - * KUniqueApplication::addCmdLineOptions(); + * TDEUniqueApplication::addCmdLineOptions(); * - * if (!KUniqueApplication::start()) { + * if (!TDEUniqueApplication::start()) { * fprintf(stderr, "myAppName is already running!\n"); * exit(0); * } - * KUniqueApplication a; + * TDEUniqueApplication a; * a.exec(); * } * \endcode * Note that it's not necessary to call start() explicitly. It will be - * called automatically before creating KUniqueApplication if it hasn't + * called automatically before creating TDEUniqueApplication if it hasn't * been called yet, without any performance impact. * * @return true if registration is successful. @@ -138,7 +138,7 @@ public: /** * Destructor */ - virtual ~KUniqueApplication(); + virtual ~TDEUniqueApplication(); /** * Dispatches any incoming DCOP message for a new instance. @@ -215,7 +215,7 @@ private: protected: virtual void virtual_hook( int id, void* data ); private: - KUniqueApplicationPrivate *d; + TDEUniqueApplicationPrivate *d; }; #endif diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h index b784e7901..1cfc9f564 100644 --- a/tdecore/tdeversion.h +++ b/tdecore/tdeversion.h @@ -32,9 +32,9 @@ A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL. A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL. */ -#define TDE_VERSION_STRING "R14.1.0 [DEVELOPMENT]" +#define TDE_VERSION_STRING "R14.2.0~[DEVELOPMENT]" #define TDE_VERSION_MAJOR 14 -#define TDE_VERSION_MINOR 1 +#define TDE_VERSION_MINOR 2 #define TDE_VERSION_RELEASE 0 #define TDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt index 36377a255..2cabe1866 100644 --- a/tdecore/tests/CMakeLists.txt +++ b/tdecore/tests/CMakeLists.txt @@ -30,23 +30,41 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC EXCLUDE_FROM_ALL ) -set( CHECKS - tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest kstddirstest - kuniqueapptest ktempfiletest krandomsequencetest kdebugtest - ksocktest kstringhandlertest kcmdlineargstest kapptest kmemtest - dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest - kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs - kprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest - kxerrorhandlertest startserviceby kglobaltest ktimezonestest +set( AUTOMATED_CHECKS + kcharsetstest kglobaltest kmacroexpandertest krfcdatetest + kstringhandlertest kurltest tdestdacceltest + + # cplusplustest # -- skip (doesn't error on errors) + # tdesimpleconfigtest # -- skip (doesn't error on errors) + # ksortablevaluelist # -- skip (doesn't error on errors) + # ksocktest # -- skip due to DNS failure ) +# Tests that require some graphical interaction / confirmation. +set( MANUAL_CHECKS_GUI + kdebugtest klocaletest knotifytest kxerrorhandlertest + startserviceby tdeconfigtestgui tdeprocesstest testqtargs +) -foreach( _check ${CHECKS} ) - tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +# Tests that require some interaction using a terminal +set( MANUAL_CHECKS_TUI + dcopkonqtest kcalendartest kcmdlineargstest kiconloadertest + kipctest kmemtest krandomsequencetest kresolvertest + kmdcodectest kshelltest ktempfiletest ktimezonestest + tdeapptest tdeprociotest tdestandarddirstest tdeuniqueapptest +) + +foreach( _check ${AUTOMATED_CHECKS} ) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared TEST ) endforeach( ) -tde_add_check_executable( kurltest AUTOMOC LINK tdeconfigtest-shared TEST ) -tde_add_check_executable( tdestdacceltest AUTOMOC LINK tdeconfigtest-shared TEST ) +foreach( _check ${MANUAL_CHECKS_GUI}) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +endforeach() + +foreach( _check ${MANUAL_CHECKS_TUI}) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +endforeach() tde_add_check_executable( kidlservertest AUTOMOC SOURCES KIDLTest.cpp KIDLTest.skel LINK tdeconfigtest-shared ) diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp index 4614ed51e..3fadee13e 100644 --- a/tdecore/tests/KIDLTestClient.cpp +++ b/tdecore/tests/KIDLTestClient.cpp @@ -7,8 +7,8 @@ int main( int argc, char** argv ) { TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ ); - kapp->dcopClient()->attach(); - // kapp->dcopClient()->registerAs( "kidlclienttest" ); + tdeApp->dcopClient()->attach(); + // tdeApp->dcopClient()->registerAs( "kidlclienttest" ); KIDLTest_stub* t = new KIDLTest_stub( "kidlservertest", "Hello" ); diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index 73e06f588..378e442d2 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -21,19 +21,19 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) -check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \ - kstddirstest kurltest kuniqueapptest ktempfiletest krandomsequencetest \ - kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest \ +check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest tdesimpleconfigtest \ + tdestandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \ + kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \ kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \ cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \ - ksortablevaluelisttest krfcdatetest testqtargs kprociotest \ + ksortablevaluelisttest krfcdatetest testqtargs tdeprociotest \ kcharsetstest kcalendartest kmacroexpandertest kshelltest \ kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest TESTS = kurltest tdestdacceltest -noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \ - kipctest.h kprociotest.h +noinst_HEADERS = klocaletest.h tdeprocesstest.h KIDLTest.h \ + kipctest.h tdeprociotest.h METASOURCES = AUTO @@ -43,12 +43,12 @@ kdebugtest_SOURCES = kdebugtest.cpp klocaletest_SOURCES = klocaletest.cpp #klocaletest2_SOURCES = klocaletest2.cpp tdelocale.cpp libintl.cpp kcatalogue.cpp #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp -ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp +tdesimpleconfigtest_SOURCES = tdesimpleconfigtest.cpp kurltest_SOURCES = kurltest.cpp -kstddirstest_SOURCES = kstddirstest.cpp -kprocesstest_SOURCES = kprocesstest.cpp -kuniqueapptest_SOURCES = kuniqueapptest.cpp -kapptest_SOURCES = kapptest.cpp +tdestandarddirstest_SOURCES = tdestandarddirstest.cpp +tdeprocesstest_SOURCES = tdeprocesstest.cpp +tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp +tdeapptest_SOURCES = tdeapptest.cpp ksocktest_SOURCES = ksocktest.cpp ktempfiletest_SOURCES = ktempfiletest.cpp krandomsequencetest_SOURCES = krandomsequencetest.cpp @@ -68,7 +68,7 @@ knotifytest_SOURCES = knotifytest.cpp ksortablevaluelisttest_SOURCES = ksortablevaluelisttest.cpp krfcdatetest_SOURCES = krfcdatetest.cpp testqtargs_SOURCES = testqtargs.cpp -kprociotest_SOURCES = kprociotest.cpp +tdeprociotest_SOURCES = tdeprociotest.cpp kcharsetstest_SOURCES = kcharsetstest.cpp kcalendartest_SOURCES = kcalendartest.cpp kmacroexpandertest_SOURCES = kmacroexpandertest.cpp diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp index b8bb055d6..531d8dfd7 100644 --- a/tdecore/tests/dcopkonqtest.cpp +++ b/tdecore/tests/dcopkonqtest.cpp @@ -6,8 +6,8 @@ int main( int argc, char** argv ) { TDEApplication app( argc, argv, "KIDLTestClient", false ); - kapp->dcopClient()->attach(); - // kapp->dcopClient()->registerAs( "kidlclienttest" ); + tdeApp->dcopClient()->attach(); + // tdeApp->dcopClient()->registerAs( "kidlclienttest" ); TQByteArray data; @@ -15,20 +15,20 @@ int main( int argc, char** argv ) TQByteArray snd; TQByteArray rcv; TQCString _type_; - kapp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv ); + tdeApp->dcopClient()->call( "konqueror", "KonquerorIface", "reparseConfiguration()", snd, _type_, rcv ); kdDebug() << _type_ << endl; if( _type_ != "void" ) kdDebug() << "void expected, " << _type_.data() << " returned" << endl; /* debug("sending configure to object KonquerorIface in konqueror"); - if (kapp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data )) + if (tdeApp->dcopClient()->send( "konqueror", "KonquerorIface", "configure()", data )) debug("ok"); else debug("ko"); /// BROADCAST debug("sending databaseChanged to object tdesycoca in all apps"); - if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) + if (tdeApp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) debug("ok"); else debug("ko"); diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp index 4052d5dcf..266eaeaae 100644 --- a/tdecore/tests/kdebugtest.cpp +++ b/tdecore/tests/kdebugtest.cpp @@ -1,12 +1,12 @@ #include "kdebug.h" #include <tqwidget.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <iostream> #include <tqapplication.h> #include <tqpen.h> #include <tqvariant.h> -class TestWidget : public QWidget +class TestWidget : public TQWidget { public: @@ -64,7 +64,7 @@ public: TQVariant v( 0.12345 ); kdDebug() << "Variant: " << v << endl; - v = TQPen( Qt::red ); + v = TQPen( TQt::red ); kdDebug() << "Variant: " << v << endl; TQByteArray data( 6 ); diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index d1a678ac9..9692710e2 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -8,12 +8,12 @@ MyObject::MyObject() : TQObject(0L, "testobj") { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged())); - connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int))); + connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged())); + connect(tdeApp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); + connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged())); + connect(tdeApp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int))); } int main(int argc, char **argv) diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h index 17122fbd8..d4c3d538d 100644 --- a/tdecore/tests/kipctest.h +++ b/tdecore/tests/kipctest.h @@ -5,17 +5,17 @@ class MyObject: public TQObject { - Q_OBJECT + TQ_OBJECT public: MyObject(); public slots: - void slotPaletteChanged() { printf("SIGNAL: Palette changed\n"); } - void slotStyleChanged() { printf("SIGNAL: Style changed\n"); } - void slotFontChanged() { printf("SIGNAL: Font changed\n"); } - void slotBackgroundChanged(int i) { printf("SIGNAL: Background %d changed\n", i); } - void slotAppearanceChanged() { printf("SIGNAL: Appearance changed\n"); } - void slotMessage(int id, int arg) { printf("SIGNAL: user message: %d,%d\n", id, arg); } + void slotPaletteChanged() { printf("TQ_SIGNAL: Palette changed\n"); } + void slotStyleChanged() { printf("TQ_SIGNAL: Style changed\n"); } + void slotFontChanged() { printf("TQ_SIGNAL: Font changed\n"); } + void slotBackgroundChanged(int i) { printf("TQ_SIGNAL: Background %d changed\n", i); } + void slotAppearanceChanged() { printf("TQ_SIGNAL: Appearance changed\n"); } + void slotMessage(int id, int arg) { printf("TQ_SIGNAL: user message: %d,%d\n", id, arg); } }; #endif diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index 5f4d1da2a..bb4c46949 100644 --- a/tdecore/tests/klocaletest.cpp +++ b/tdecore/tests/klocaletest.cpp @@ -1,4 +1,3 @@ -// klocaletest.cpp -*- C++ -*- // // $Id$ // diff --git a/tdecore/tests/klocaletest.h b/tdecore/tests/klocaletest.h index 6634b6107..433807b78 100644 --- a/tdecore/tests/klocaletest.h +++ b/tdecore/tests/klocaletest.h @@ -11,7 +11,7 @@ class TQLabel; */ class Test : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**@name methods */ diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp index 571d3f10b..4cc06813d 100644 --- a/tdecore/tests/kmdcodectest.cpp +++ b/tdecore/tests/kmdcodectest.cpp @@ -268,7 +268,7 @@ void MD5_verify( const char *input, const char *digest, bool isFile ) cout << "Calculated Digest = " << context.hexDigest() << endl; cout << "Supplied Digest = " << digest << endl; - cout << "Matches: " << (result ? "TRUE":"FALSE") << endl; + cout << "Matches: " << (result ? "true":"false") << endl; } void MD5_file (const char *filename, bool rawOutput ) diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp index 44f1ce15a..f83d2a80f 100644 --- a/tdecore/tests/krandomsequencetest.cpp +++ b/tdecore/tests/krandomsequencetest.cpp @@ -54,7 +54,7 @@ main(int argc, char *argv[]) for(int i = 0; i < 20; i++) printf("%3ld ", seq.getLong(100)); - seq.setSeed(kapp->random()); + seq.setSeed(tdeApp->random()); TQPtrList<TQString> list; list.append(new TQString("A")); diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp index 9f476cd51..58d0e9ac1 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -36,7 +36,7 @@ #include <tqptrlist.h> #include <tqstring.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <ksocks.h> #include <ksockaddr.h> #include <kextsock.h> @@ -62,11 +62,11 @@ namespace KDE extern const int resolverFlags; } -class TestApp : public KUniqueApplication +class TestApp : public TDEUniqueApplication { public: TestApp() : - KUniqueApplication() + TDEUniqueApplication() { } int newInstance(TQValueList<TQCString> params); @@ -412,7 +412,7 @@ int main(int argc, char **argv) { TDEAboutData about("socktest2", "SockTest", "1.0"); TDECmdLineArgs::init(argc, argv, &about); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); /* TestApp a; a.exec();*/ diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp index 94358a8f1..c67c5a4e2 100644 --- a/tdecore/tests/krfcdatetest.cpp +++ b/tdecore/tests/krfcdatetest.cpp @@ -59,6 +59,12 @@ int main(int argc, char *argv[]) a = KRFCDate::parseDateISO8601("1994-01-01"); check( "1994-01-01", a, b ); + a = KRFCDate::parseDateISO8601("1994-01-01T12"); + check("1994-01-01T12", a, b); + + a = KRFCDate::parseDateISO8601("1994-01-01T12:00"); + check("1994-01-01T12:00", a, b); + b = 0; // pass RFC date to ISO parser diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp index a1ce8f86b..ec9c1ec95 100644 --- a/tdecore/tests/ksocktest.cpp +++ b/tdecore/tests/ksocktest.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ -#include "kuniqueapplication.h" +#include "tdeuniqueapplication.h" #include "tdeglobal.h" #include "kdebug.h" #include "ksock.h" @@ -103,7 +103,7 @@ main(int argc, char *argv[]) TDESocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() ); check( "peerAddress:", addr->nodeName().latin1(), "213.203.58.36" ); - check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 80)) ? "TRUE" : "FALSE", "TRUE"); - check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 8080)) ? "TRUE" : "FALSE", "FALSE"); - check( "isEqual:", addr->isCoreEqual(KInetSocketAddress("213.203.58.36", 8080)) ? "TRUE" : "FALSE", "TRUE"); + check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 80)) ? "true" : "false", "true"); + check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 8080)) ? "true" : "false", "false"); + check( "isEqual:", addr->isCoreEqual(KInetSocketAddress("213.203.58.36", 8080)) ? "true" : "false", "true"); } diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp index 019db0690..38960bf1a 100644 --- a/tdecore/tests/ktempfiletest.cpp +++ b/tdecore/tests/ktempfiletest.cpp @@ -18,7 +18,7 @@ #include "tdetempfile.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include <tqstring.h> #include <unistd.h> diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp index d00626cdf..a42c5a395 100644 --- a/tdecore/tests/ktimezonestest.cpp +++ b/tdecore/tests/ktimezonestest.cpp @@ -22,8 +22,8 @@ int main(int argc, char *argv[]) // Find some offsets for Europe/London. const char *london = "Europe/London"; timezone = timezones.zone(london); - TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", Qt::ISODate)); - TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", Qt::ISODate)); + TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", TQt::ISODate)); + TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", TQt::ISODate)); printf( "%s winter timezone offset should be 0: %d\n", london, timezone->offset(winter) ); printf( "%s summer timezone offset should be 3600: %d\n", london, timezone->offset(summer) ); @@ -34,13 +34,13 @@ int main(int argc, char *argv[]) const char *gmtBeforePst = "2005-10-30T01:00:00"; const char *gmtAfterPst = "2005-12-01T00:00:00"; TQString result; - result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, TQt::ISODate)).toString(TQt::ISODate); printf( "BST before PDT, %s should be 2005-03-27T15:00:00: %s\n", bstBeforePdt, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, TQt::ISODate)).toString(TQt::ISODate); printf( "BST and PDT, %s should be 2005-04-30T16:00:00: %s\n", bstAfterPdt, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, TQt::ISODate)).toString(TQt::ISODate); printf( "GMT before PST, %s should be 2005-10-29T17:00:00: %s\n", gmtBeforePst, result.latin1() ); - result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, Qt::ISODate)).toString(Qt::ISODate); + result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, TQt::ISODate)).toString(TQt::ISODate); printf( "GMT and PST, %s should be 2005-11-30T16:00:00: %s\n", gmtAfterPst, result.latin1() ); printf( "Latitude 89 should be valid: %svalid\n", KTimezone::isValidLatitude(89.0) ? "" : "in"); printf( "Latitude 91 should be invalid: %svalid\n", KTimezone::isValidLatitude(91.0) ? "" : "in"); diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index 0f57dd97c..b80515e81 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -88,25 +88,25 @@ int main(int argc, char *argv[]) KURL::List lst; KURL emptyURL; - check( "KURL::isMalformed()", emptyURL.isMalformed() ? "TRUE":"FALSE", "TRUE"); - check( "KURL::isValid()", emptyURL.isValid() ? "TRUE":"FALSE", "FALSE"); - check( "KURL::isEmpty()", emptyURL.isEmpty() ? "TRUE":"FALSE", "TRUE"); + check( "KURL::isMalformed()", emptyURL.isMalformed() ? "true":"false", "true"); + check( "KURL::isValid()", emptyURL.isValid() ? "true":"false", "false"); + check( "KURL::isEmpty()", emptyURL.isEmpty() ? "true":"false", "true"); check( "prettyURL()", emptyURL.prettyURL(), ""); - check( "isLocalFile()", emptyURL.isLocalFile()?"TRUE":"FALSE", "FALSE" ); + check( "isLocalFile()", emptyURL.isLocalFile()?"true":"false", "false" ); emptyURL = ""; - check( "KURL::isMalformed()", emptyURL.isMalformed() ? "TRUE":"FALSE", "TRUE"); - check( "KURL::isValid()", emptyURL.isValid() ? "TRUE":"FALSE", "FALSE"); - check( "KURL::isEmpty()", emptyURL.isEmpty() ? "TRUE":"FALSE", "TRUE"); + check( "KURL::isMalformed()", emptyURL.isMalformed() ? "true":"false", "true"); + check( "KURL::isValid()", emptyURL.isValid() ? "true":"false", "false"); + check( "KURL::isEmpty()", emptyURL.isEmpty() ? "true":"false", "true"); KURL fileURL = "file:/"; - check( "KURL::isEmpty()", fileURL.isEmpty() ? "TRUE":"FALSE", "FALSE"); + check( "KURL::isEmpty()", fileURL.isEmpty() ? "true":"false", "false"); fileURL = "file:///"; - check( "KURL::isEmpty()", fileURL.isEmpty() ? "TRUE":"FALSE", "FALSE"); + check( "KURL::isEmpty()", fileURL.isEmpty() ? "true":"false", "false"); KURL baseURL ("hTTp://www.foo.bar:80" ); - check( "KURL::isValid()", baseURL.isValid() ? "TRUE":"FALSE", "TRUE"); + check( "KURL::isValid()", baseURL.isValid() ? "true":"false", "true"); check( "KURL::protocol()", baseURL.protocol(), "http"); // lowercase KURL url1 ( baseURL, "//www1.foo.bar" ); check( "KURL::host()", url1.host(), "www1.foo.bar"); @@ -184,13 +184,13 @@ int main(int argc, char *argv[]) check("KURL::upURL()", url1.upURL().url(), "file:///home/dfaure/"); url1 = "gg:www.kde.org"; - check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "TRUE" ); + check("KURL::isValid()", url1.isValid()?"true":"false", "true" ); url1= "KDE"; - check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" ); + check("KURL::isValid()", url1.isValid()?"true":"false", "false" ); url1= "$HOME/.trinity/share/config"; - check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" ); + check("KURL::isValid()", url1.isValid()?"true":"false", "false" ); u1 = "file:/opt/kde2/qt2/doc/html/showimg-main-cpp.html#TQObject::connect"; url1 = u1; @@ -271,14 +271,14 @@ int main(int argc, char *argv[]) #if 0 // This URL is broken, '#' should be escaped. - u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#"; + u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#"; url1 = u1; - check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#"); + check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#"); check("KURL::hasRef()", url1.hasRef() ? "yes" : "no", "no"); check("KURL::hasHTMLRef()", url1.hasHTMLRef() ? "yes" : "no", "no"); check("KURL::htmlRef()", url1.htmlRef(), ""); check("KURL::hasSubURL()", url1.hasSubURL() ? "yes" : "no", "yes"); - check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#"); + check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#"); #endif u1 = "file:/home/dfaure/my%20tar%20file.tgz#gzip:/#tar:/README"; @@ -382,7 +382,7 @@ int main(int argc, char *argv[]) check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myfile.txt"); u2.setFileName( "myotherfile.txt" ); check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt"); - // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238) + // more tricky, renaming a directory (kpropsdlg.cpp, line ~ 238) TQString tmpurl = "file:/home/dfaure/myolddir/"; if ( tmpurl.at(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first @@ -1115,9 +1115,9 @@ int main(int argc, char *argv[]) KURL emptyUserTest1("http://www.foobar.com/"); KURL emptyUserTest2("http://www.foobar.com/"); emptyUserTest2.setUser(""); - check("Empty vs. null fields: user", emptyUserTest1==emptyUserTest2?"TRUE":"FALSE","TRUE"); + check("Empty vs. null fields: user", emptyUserTest1==emptyUserTest2?"true":"false","true"); emptyUserTest2.setPass(""); - check("Empty vs. null fields: password", emptyUserTest1==emptyUserTest2?"TRUE":"FALSE","TRUE"); + check("Empty vs. null fields: password", emptyUserTest1==emptyUserTest2?"true":"false","true"); printf("\nTest OK !\n"); } diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp index 67c535cec..8d23042ef 100644 --- a/tdecore/tests/startserviceby.cpp +++ b/tdecore/tests/startserviceby.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) { - TDEAboutData about("kapptest", "kapptest", "version"); + TDEAboutData about("tdeapptest", "tdeapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication a; diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/tdeapptest.cpp index 6a3abace9..09e9124b6 100644 --- a/tdecore/tests/kapptest.cpp +++ b/tdecore/tests/tdeapptest.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) { - TDEAboutData about("kapptest", "kapptest", "version"); + TDEAboutData about("tdeapptest", "tdeapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication a; diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp index f5ea428c0..8db4fce3a 100644 --- a/tdecore/tests/tdeconfigtestgui.cpp +++ b/tdecore/tests/tdeconfigtestgui.cpp @@ -35,7 +35,7 @@ #include <tqfileinfo.h> #include <tqdatetime.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <config.h> // Standard Qt widgets @@ -76,8 +76,8 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pAppFileEdit = new TQLineEdit( this, "appconfigedit" ); pAppFileEdit->setGeometry( 240, 20, 160, 20 ); - connect( pAppFileEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(appConfigEditReturnPressed())); + connect( pAppFileEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(appConfigEditReturnPressed())); // Label and edit for the group pGroupLabel = new TQLabel( this, "grouplabel" ); @@ -86,14 +86,14 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pGroupEdit = new TQLineEdit( this, "groupedit" ); pGroupEdit->setGeometry( 120, 60, 100, 20 ); - connect( pGroupEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(groupEditReturnPressed())); + connect( pGroupEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(groupEditReturnPressed())); // Edit and label for the key/value pair pKeyEdit = new TQLineEdit( this, "keyedit" ); pKeyEdit->setGeometry( 20, 100, 80, 20 ); - connect( pKeyEdit, TQT_SIGNAL( returnPressed()), - TQT_SLOT(keyEditReturnPressed())); + connect( pKeyEdit, TQ_SIGNAL( returnPressed()), + TQ_SLOT(keyEditReturnPressed())); pEqualsLabel = new TQLabel( this, "equalslabel" ); pEqualsLabel->setGeometry( 105, 100, 20, 20 ); @@ -106,7 +106,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pWriteButton = new TQPushButton( this, "writebutton" ); pWriteButton->setGeometry( 20,140, 80, 20 ); pWriteButton->setText( "Write entry" ); - connect( pWriteButton, TQT_SIGNAL(clicked()), TQT_SLOT( writeButtonClicked() ) ); + connect( pWriteButton, TQ_SIGNAL(clicked()), TQ_SLOT( writeButtonClicked() ) ); // Labels for the info line pInfoLabel1 = new TQLabel( this, "infolabel1" ); @@ -121,7 +121,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pQuitButton = new TQPushButton( this, "quitbutton" ); pQuitButton->setText( "Quit" ); pQuitButton->setGeometry( 340, 60, 60, 60 ); - connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); + connect( pQuitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); // create a default TDEConfig object in order to be able to start right away pConfig = new TDEConfig( TQString::null ); diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h index a7cfd1356..520cb79cf 100644 --- a/tdecore/tests/tdeconfigtestgui.h +++ b/tdecore/tests/tdeconfigtestgui.h @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqfileinfo.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqtextstream.h> // Standard Qt widgets @@ -41,7 +41,7 @@ class TDEConfigTestView : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TDEConfigTestView( TQWidget *parent=0, const char *name=0 ); ~TDEConfigTestView(); diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/tdeprocesstest.cpp index d8d86d988..0d27f69fa 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/tdeprocesstest.cpp @@ -9,7 +9,7 @@ // -#include "kprocess.h" +#include "tdeprocess.h" #include <stdio.h> #include <string.h> @@ -17,7 +17,7 @@ #include <signal.h> -#include "kprocesstest.h" +#include "tdeprocesstest.h" #define PROCNO 10 @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) { TDEProcess p1, p2, p3, p4; Dummy dummy; - TDEApplication app(argc, argv, TQCString("kprocesstest")); + TDEApplication app(argc, argv, TQCString("tdeprocesstest")); printf("Welcome to the TDEProcess Demo Application!\n"); @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) // p1 << "kghostview"; - TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p1, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); printf("starting kghostview blocking (close to continue)\n"); p1.start(TDEProcess::Block); @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("Starting konsole with /bin/tcsh as shell (close to continue)\n"); p2 << "konsole" << "-e" << "/bin/tcsh"; p2.setWorkingDirectory("/tmp"); - TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p2, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); p2.start(TDEProcess::Block); // @@ -70,13 +70,13 @@ int main(int argc, char *argv[]) // p3 << "ls" << "-l"; - TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p3, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); @@ -93,16 +93,16 @@ int main(int argc, char *argv[]) // p4 << "sort"; - TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)), - &dummy, TQT_SLOT(outputDone(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(wroteStdin(TDEProcess *)), + &dummy, TQ_SLOT(outputDone(TDEProcess *))); p4.start(TDEProcess::NotifyOnExit, TDEProcess::All); printf("after p4.start"); @@ -113,4 +113,4 @@ int main(int argc, char *argv[]) return 0; } -#include "kprocesstest.moc" +#include "tdeprocesstest.moc" diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/tdeprocesstest.h index 5817af438..32a559157 100644 --- a/tdecore/tests/kprocesstest.h +++ b/tdecore/tests/tdeprocesstest.h @@ -13,11 +13,11 @@ #include <stdio.h> #include <tqobject.h> -#include "kprocess.h" +#include "tdeprocess.h" class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void printMessage(TDEProcess *proc) @@ -46,5 +46,3 @@ class Dummy : public TQObject }; #endif - - diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/tdeprociotest.cpp index f7e895345..16c9b14b6 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/tdeprociotest.cpp @@ -9,7 +9,7 @@ // -#include "kprocess.h" +#include "tdeprocess.h" #include <stdio.h> #include <string.h> @@ -17,7 +17,7 @@ #include <signal.h> -#include "kprociotest.h" +#include "tdeprociotest.h" @@ -32,17 +32,17 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n int main(int argc, char *argv[]) { Dummy dummy; - TDEApplication app(argc, argv, TQCString("kprociotest")); + TDEApplication app(argc, argv, TQCString("tdeprociotest")); - printf("Welcome to the KProcIO Demo Application!\n"); + printf("Welcome to the TDEProcIO Demo Application!\n"); - KProcIO p; + TDEProcIO p; p << "rev"; - p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*))); - p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*))); + p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*))); + p.connect(&p, TQ_SIGNAL(readReady(TDEProcIO*)), &dummy, TQ_SLOT(gotOutput(TDEProcIO*))); bool b; @@ -62,4 +62,4 @@ int main(int argc, char *argv[]) return 0; } -#include "kprociotest.moc" +#include "tdeprociotest.moc" diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/tdeprociotest.h index fd60bb87b..194a26504 100644 --- a/tdecore/tests/kprociotest.h +++ b/tdecore/tests/tdeprociotest.h @@ -13,11 +13,11 @@ #include <stdio.h> #include <tqobject.h> -#include "kprocio.h" +#include "tdeprocio.h" class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public slots: void printMessage(TDEProcess *proc) @@ -25,7 +25,7 @@ class Dummy : public TQObject printf("Process %d exited!\n", (int)proc->getPid()); } - void gotOutput(KProcIO*proc) + void gotOutput(TDEProcIO*proc) { TQString line; while(true) { diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/tdesimpleconfigtest.cpp index ca91581dd..5759d8941 100644 --- a/tdecore/tests/ksimpleconfigtest.cpp +++ b/tdecore/tests/tdesimpleconfigtest.cpp @@ -3,9 +3,9 @@ // // configtest.cpp: libKDEcore example // -// demonstrates use of KSimpleConfig class +// demonstrates use of TDESimpleConfig class -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <unistd.h> #include <stdio.h> @@ -22,7 +22,7 @@ int main( int argc, char **argv ) { TDEApplication a( argc, argv, TQCString("tdeconfigtest") ); - KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" ); + TDESimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" ); aConfig.setGroup( "Test group" ); aConfig.writeEntry( "key1", "value1" ); @@ -32,17 +32,17 @@ int main( int argc, char **argv ) aConfig.writeEntry( "akey1", "avalue1" ); aConfig.writeEntry( "akey2", "avalue2" ); - fprintf( stderr, "[ksimpleconfigtest] entries written, sleeping for 10 seconds\n" ); + fprintf( stderr, "[tdesimpleconfigtest] entries written, sleeping for 10 seconds\n" ); aConfig.sync(); sleep( 10 ); aConfig.setGroup( "Test group" ); aConfig.deleteEntry( "key2", false ); - fprintf( stderr, "[ksimpleconfigtest] Deleted on entry from Test group, sleeping\n" ); + fprintf( stderr, "[tdesimpleconfigtest] Deleted on entry from Test group, sleeping\n" ); aConfig.sync(); sleep( 10 ); aConfig.deleteGroup( "Another Test group", true ); - fprintf( stderr, "[ksimpleconfigtest] Deleted Another Test group\n" ); + fprintf( stderr, "[tdesimpleconfigtest] Deleted Another Test group\n" ); } diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/tdestandarddirstest.cpp index ae6ea16bd..28c974b9e 100644 --- a/tdecore/tests/kstddirstest.cpp +++ b/tdecore/tests/tdestandarddirstest.cpp @@ -1,7 +1,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> int main(int argc, char **argv) diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/tdeuniqueapptest.cpp index 13b8ca534..7ea5b6308 100644 --- a/tdecore/tests/kuniqueapptest.cpp +++ b/tdecore/tests/tdeuniqueapptest.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ -#include "kuniqueapplication.h" +#include "tdeuniqueapplication.h" #include "tdeglobalsettings.h" #include <unistd.h> @@ -25,10 +25,10 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -class TestApp : public KUniqueApplication +class TestApp : public TDEUniqueApplication { public: - TestApp() : KUniqueApplication("TestApp") { } + TestApp() : TDEUniqueApplication("TestApp") { } virtual int newInstance( ); }; @@ -43,9 +43,9 @@ TestApp::newInstance( ) int main(int argc, char *argv[]) { - TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version"); + TDEAboutData about("tdeuniqueapptest", "tdeuniqueapptest", "version"); TDECmdLineArgs::init(argc, argv, &about); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); if (!TestApp::start()) { @@ -54,6 +54,6 @@ main(int argc, char *argv[]) TestApp a; printf("Running.\n"); - kapp->exec(); + tdeApp->exec(); printf("Terminating.\n"); } diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp index d69b3f6f4..cb67ab02a 100644 --- a/tdecore/tests/testqtargs.cpp +++ b/tdecore/tests/testqtargs.cpp @@ -29,7 +29,7 @@ -background, you get the same thing. in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used - by the static method Kapplication::addCmdLineOptions to add the Qt options + by the static method TDEApplication::addCmdLineOptions to add the Qt options but its' entries look like this: { "background <color>", I18N_NOOP("sets the default background color and an\n diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 308da8c5a..6e96b3b66 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -26,7 +26,7 @@ #include <sysent.h> #endif -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tqbitmap.h> #include <tqimage.h> #include <tqwhatsthis.h> @@ -45,7 +45,7 @@ #include <tdelocale.h> #include <dcopclient.h> #include <dcopref.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <tdestartupinfo.h> #include <kxerrorhandler.h> @@ -103,7 +103,7 @@ static void twin_net_create_atoms() { /* Sends a client message to the ROOT window. */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z = 0 ){ XEvent ev; long mask; @@ -124,7 +124,7 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z /* Send a client message to window w */ -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static void sendClientMessage(Window w, Atom a, long x){ XEvent ev; long mask; @@ -145,7 +145,7 @@ static void sendClientMessage(Window w, Atom a, long x){ bool KWin::compositingActive() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); return XGetSelectionOwner( tqt_xdisplay(), net_wm_cm ) != None; #else @@ -153,7 +153,7 @@ bool KWin::compositingActive() #endif } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 namespace { class ContextWidget : public TQWidget @@ -167,7 +167,7 @@ ContextWidget::ContextWidget() : TQWidget(0,0) { twin_net_create_atoms(); - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); TQWhatsThis::enterWhatsThisMode(); TQCursor c = *TQApplication::overrideCursor(); TQWhatsThis::leaveWhatsThisMode(); @@ -213,14 +213,14 @@ bool ContextWidget::x11Event( XEvent * ev) void KWin::invokeContextHelp() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ContextWidget w; #endif } void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), trayWin, tqt_xrootwin(), 0 ); if ( !forWin ) forWin = tqt_xrootwin(); @@ -236,39 +236,39 @@ void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin ) void KWin::activateWindow( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); if( time == 0 ) - time = GET_QT_X_USER_TIME(); + time = get_tqt_x_user_time(); info.setActiveWindow( win, NET::FromApplication, time, - kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 ); -#endif // Q_WS_X11 ... - KUniqueApplication::setHandleAutoStarted(); + tdeApp->activeWindow() ? tdeApp->activeWindow()->winId() : 0 ); +#endif // TQ_WS_X11 ... + TDEUniqueApplication::setHandleAutoStarted(); } void KWin::forceActiveWindow( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); if( time == 0 ) - time = GET_QT_X_TIME(); + time = get_tqt_x_time(); info.setActiveWindow( win, NET::FromTool, time, 0 ); -#endif // Q_WS_X11 - KUniqueApplication::setHandleAutoStarted(); +#endif // TQ_WS_X11 + TDEUniqueApplication::setHandleAutoStarted(); } void KWin::setActiveWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), 0 ); info.setActiveWindow( win, NET::FromUnknown, 0, 0 ); #endif - KUniqueApplication::setHandleAutoStarted(); + TDEUniqueApplication::setHandleAutoStarted(); } void KWin::demandAttention( WId win, bool set ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setState( set ? NET::DemandsAttention : 0, NET::DemandsAttention ); #endif @@ -276,7 +276,7 @@ void KWin::demandAttention( WId win, bool set ) void KWin::setUserTime( WId win, long time ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setUserTime( time ); #endif @@ -290,7 +290,7 @@ KWin::WindowInfo KWin::windowInfo( WId win, unsigned long properties, unsigned l WId KWin::transientFor( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow Window transient_for = None; if( XGetTransientForHint( tqt_xdisplay(), win, &transient_for )) @@ -304,17 +304,17 @@ WId KWin::transientFor( WId win ) void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mainwindow != 0 ) { /* Grmbl. See TQDialog::show(). That should get fixed in Qt somehow. */ - if( tqqt_cast< TQDialog* >( subwindow ) != NULL + if( tqt_cast< TQDialog* >( subwindow ) != NULL && subwindow->parentWidget() == NULL - && kapp->mainWidget() != NULL ) + && tdeApp->mainWidget() != NULL ) { - kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget()," + kdWarning() << "KWin::setMainWindow(): There either mustn't be tdeApp->mainWidget()," " or the dialog must have a non-NULL parent, otherwise Qt will reset the change. Bummer." << endl; } XSetTransientForHint( tqt_xdisplay(), subwindow->winId(), mainwindow ); @@ -326,7 +326,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) WId KWin::groupLeader( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow XWMHints *hints = XGetWMHints( tqt_xdisplay(), win ); Window window_group = None; @@ -347,7 +347,7 @@ WId KWin::groupLeader( WId win ) KWin::Info KWin::info( WId win ) { Info w; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo inf( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState | NET::WMStrut | @@ -398,11 +398,11 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale ) TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; // ignore badwindow #endif TQPixmap result; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( flags & NETWM ) { NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMIcon ); NETIcon ni = info.icon( width, height ); @@ -514,7 +514,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( icon.isNull() ) return; NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); @@ -536,7 +536,7 @@ void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) void KWin::setType( WId win, NET::WindowType windowType ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); info.setWindowType( windowType ); #endif @@ -544,7 +544,7 @@ void KWin::setType( WId win, NET::WindowType windowType ) void KWin::setState( WId win, unsigned long state ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState ); info.setState( state, state ); #endif @@ -552,7 +552,7 @@ void KWin::setState( WId win, unsigned long state ) void KWin::clearState( WId win, unsigned long state ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState ); info.setState( 0, state ); #endif @@ -560,7 +560,7 @@ void KWin::clearState( WId win, unsigned long state ) void KWin::setOpacity( WId win, uint percent ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); if (percent > 99) XDeleteProperty (tqt_xdisplay(), win, kde_wm_window_opacity); @@ -574,7 +574,7 @@ void KWin::setOpacity( WId win, uint percent ) void KWin::setShadowSize( WId win, uint percent ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 twin_net_create_atoms(); long shadowSize = long(0xFFFFFFFF/100.0*percent); XChangeProperty(tqt_xdisplay(), win, kde_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &shadowSize, 1L); @@ -583,7 +583,7 @@ void KWin::setShadowSize( WId win, uint percent ) void KWin::setOnAllDesktops( WId win, bool b ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop ); if ( b ) info.setDesktop( NETWinInfo::OnAllDesktops ); @@ -596,7 +596,7 @@ void KWin::setOnAllDesktops( WId win, bool b ) void KWin::setOnDesktop( WId win, int desktop ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop ); info.setDesktop( desktop ); #endif @@ -606,7 +606,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, int bottom_width, int bottom_start, int bottom_end ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); NETExtendedStrut strut; strut.left_width = left_width; @@ -627,7 +627,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e void KWin::setStrut( WId win, int left, int right, int top, int bottom ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 ); NETStrut strut; strut.left = left; @@ -640,11 +640,11 @@ void KWin::setStrut( WId win, int left, int right, int top, int bottom ) int KWin::currentDesktop() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (!tqt_xdisplay()) #endif return 1; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); return info.currentDesktop(); #endif @@ -652,11 +652,11 @@ int KWin::currentDesktop() int KWin::numberOfDesktops() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if (!tqt_xdisplay()) #endif return 0; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops ); return info.numberOfDesktops(); #endif @@ -664,7 +664,7 @@ int KWin::numberOfDesktops() void KWin::setCurrentDesktop( int desktop ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); info.setCurrentDesktop( desktop ); #endif @@ -672,7 +672,7 @@ void KWin::setCurrentDesktop( int desktop ) void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop ); NETPoint netview; netview.x = viewport.x(); @@ -683,7 +683,7 @@ void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport ) void KWin::iconifyWindow( WId win, bool animation) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !animation ) { twin_net_create_atoms(); @@ -696,7 +696,7 @@ void KWin::iconifyWindow( WId win, bool animation) void KWin::deIconifyWindow( WId win, bool animation ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( !animation ) { twin_net_create_atoms(); @@ -708,7 +708,7 @@ void KWin::deIconifyWindow( WId win, bool animation ) void KWin::raiseWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::Supported ); if( info.isSupported( NET::WM2RestackWindow )) info.restackRequest( win, None, Above ); @@ -719,7 +719,7 @@ void KWin::raiseWindow( WId win ) void KWin::lowerWindow( WId win ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETRootInfo info( tqt_xdisplay(), NET::Supported ); if( info.isSupported( NET::WM2RestackWindow )) info.restackRequest( win, None, Below ); @@ -730,7 +730,7 @@ void KWin::lowerWindow( WId win ) void KWin::appStarted() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfo::appStarted(); #endif } @@ -739,11 +739,11 @@ class KWin::WindowInfoPrivate { public: WindowInfoPrivate() -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 : info( NULL ) #endif {} -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 ~WindowInfoPrivate() { delete info; } NETWinInfo* info; #endif @@ -762,7 +762,7 @@ class KWin::WindowInfoPrivate // KWin::info() should be updated too if something has to be changed here KWin::WindowInfo::WindowInfo( WId win, unsigned long properties, unsigned long properties2 ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KXErrorHandler handler; d = new WindowInfoPrivate; d->ref = 1; @@ -862,7 +862,7 @@ WId KWin::WindowInfo::win() const unsigned long KWin::WindowInfo::state() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMState ) == 0, 176 ) << "Pass NET::WMState to KWin::windowInfo()" << endl; return d->info->state(); @@ -873,7 +873,7 @@ unsigned long KWin::WindowInfo::state() const NET::MappingState KWin::WindowInfo::mappingState() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::XAWMState ) == 0, 176 ) << "Pass NET::XAWMState to KWin::windowInfo()" << endl; return d->info->mappingState(); @@ -884,7 +884,7 @@ NET::MappingState KWin::WindowInfo::mappingState() const NETExtendedStrut KWin::WindowInfo::extendedStrut() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ExtendedStrut ) == 0, 176 ) << "Pass NET::WM2ExtendedStrut to second argument of KWin::windowInfo()" << endl; NETExtendedStrut ext = d->info->extendedStrut(); @@ -922,7 +922,7 @@ NETExtendedStrut KWin::WindowInfo::extendedStrut() const NETStrut KWin::WindowInfo::strut() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMStrut ) == 0, 176 ) << "Pass NET::WMStrut to KWin::windowInfo()" << endl; return d->info->strut(); @@ -934,7 +934,7 @@ NETStrut KWin::WindowInfo::strut() const NET::WindowType KWin::WindowInfo::windowType( int supported_types ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMWindowType ) == 0, 176 ) << "Pass NET::WMWindowType to KWin::windowInfo()" << endl; return d->info->windowType( supported_types ); @@ -965,7 +965,7 @@ TQString KWin::Info::visibleNameWithState() const TQString KWin::WindowInfo::visibleName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleName ) == 0, 176 ) << "Pass NET::WMVisibleName to KWin::windowInfo()" << endl; return d->info->visibleName() && d->info->visibleName()[ 0 ] != '\0' @@ -977,7 +977,7 @@ TQString KWin::WindowInfo::visibleName() const TQString KWin::WindowInfo::name() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMName ) == 0, 176 ) << "Pass NET::WMName to KWin::windowInfo()" << endl; return d->name_; @@ -998,7 +998,7 @@ TQString KWin::WindowInfo::visibleIconNameWithState() const TQString KWin::WindowInfo::visibleIconName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleIconName ) == 0, 176 ) << "Pass NET::WMVisibleIconName to KWin::windowInfo()" << endl; if( d->info->visibleIconName() && d->info->visibleIconName()[ 0 ] != '\0' ) @@ -1013,7 +1013,7 @@ TQString KWin::WindowInfo::visibleIconName() const TQString KWin::WindowInfo::iconName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMIconName ) == 0, 176 ) << "Pass NET::WMIconName to KWin::windowInfo()" << endl; if( d->info->iconName() && d->info->iconName()[ 0 ] != '\0' ) @@ -1026,7 +1026,7 @@ TQString KWin::WindowInfo::iconName() const bool KWin::WindowInfo::isOnCurrentDesktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 return isOnDesktop( KWin::currentDesktop()); #else return false; @@ -1035,7 +1035,7 @@ bool KWin::WindowInfo::isOnCurrentDesktop() const bool KWin::WindowInfo::isOnDesktop( int desktop ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop() == desktop || d->info->desktop() == NET::OnAllDesktops; @@ -1046,7 +1046,7 @@ bool KWin::WindowInfo::isOnDesktop( int desktop ) const bool KWin::WindowInfo::onAllDesktops() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop() == NET::OnAllDesktops; @@ -1057,7 +1057,7 @@ bool KWin::WindowInfo::onAllDesktops() const int KWin::WindowInfo::desktop() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 ) << "Pass NET::WMDesktop to KWin::windowInfo()" << endl; return d->info->desktop(); @@ -1068,7 +1068,7 @@ int KWin::WindowInfo::desktop() const TQRect KWin::WindowInfo::geometry() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMGeometry ) == 0, 176 ) << "Pass NET::WMGeometry to KWin::windowInfo()" << endl; return d->geometry_; @@ -1079,7 +1079,7 @@ TQRect KWin::WindowInfo::geometry() const TQRect KWin::WindowInfo::frameGeometry() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMKDEFrameStrut ) == 0, 176 ) << "Pass NET::WMKDEFrameStrut to KWin::windowInfo()" << endl; return d->frame_geometry_; @@ -1090,7 +1090,7 @@ TQRect KWin::WindowInfo::frameGeometry() const WId KWin::WindowInfo::transientFor() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2TransientFor ) == 0, 176 ) << "Pass NET::WM2TransientFor to KWin::windowInfo()" << endl; return d->info->transientFor(); @@ -1101,7 +1101,7 @@ WId KWin::WindowInfo::transientFor() const WId KWin::WindowInfo::groupLeader() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2GroupLeader ) == 0, 176 ) << "Pass NET::WM2GroupLeader to KWin::windowInfo()" << endl; return d->info->groupLeader(); @@ -1112,7 +1112,7 @@ WId KWin::WindowInfo::groupLeader() const TQCString KWin::WindowInfo::windowClassClass() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 ) << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl; return d->info->windowClassClass(); @@ -1123,7 +1123,7 @@ TQCString KWin::WindowInfo::windowClassClass() const TQCString KWin::WindowInfo::windowClassName() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 ) << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl; return d->info->windowClassName(); @@ -1134,7 +1134,7 @@ TQCString KWin::WindowInfo::windowClassName() const TQCString KWin::WindowInfo::windowRole() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowRole ) == 0, 176 ) << "Pass NET::WM2WindowRole to KWin::windowInfo()" << endl; return d->info->windowRole(); @@ -1145,7 +1145,7 @@ TQCString KWin::WindowInfo::windowRole() const TQCString KWin::WindowInfo::clientMachine() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ClientMachine ) == 0, 176 ) << "Pass NET::WM2ClientMachine to KWin::windowInfo()" << endl; return d->info->clientMachine(); @@ -1156,7 +1156,7 @@ TQCString KWin::WindowInfo::clientMachine() const bool KWin::WindowInfo::actionSupported( NET::Action action ) const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2AllowedActions ) == 0, 176 ) << "Pass NET::WM2AllowedActions to KWin::windowInfo()" << endl; if( allowedActionsSupported()) @@ -1169,7 +1169,7 @@ bool KWin::WindowInfo::actionSupported( NET::Action action ) const // see NETWM spec section 7.6 bool KWin::WindowInfo::isMinimized() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mappingState() != NET::Iconic ) return false; // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows @@ -1186,7 +1186,7 @@ bool KWin::WindowInfo::isMinimized() const bool KWin::Info::isMinimized() const { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( mappingState != NET::Iconic ) return false; // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows @@ -1208,7 +1208,7 @@ bool KWin::Info::isIconified() const bool KWin::icccmCompliantMappingState() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static enum { noidea, yes, no } wm_is_1_2_compliant = noidea; if( wm_is_1_2_compliant == noidea ) { NETRootInfo info( tqt_xdisplay(), NET::Supported ); @@ -1222,7 +1222,7 @@ bool KWin::icccmCompliantMappingState() bool KWin::allowedActionsSupported() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 static enum { noidea, yes, no } wm_supports_allowed_actions = noidea; if( wm_supports_allowed_actions == noidea ) { NETRootInfo info( tqt_xdisplay(), NET::Supported ); @@ -1236,13 +1236,13 @@ bool KWin::allowedActionsSupported() TQString KWin::readNameProperty( WId win, unsigned long atom ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XTextProperty tp; char **text = NULL; int count; #endif TQString result; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if ( XGetTextProperty( tqt_xdisplay(), win, &tp, atom ) != 0 && tp.value != NULL ) { if (!twin_UTF8_STRING) diff --git a/tdecore/twin.h b/tdecore/twin.h index 141edeffc..53d697131 100644 --- a/tdecore/twin.h +++ b/tdecore/twin.h @@ -110,7 +110,7 @@ public: * @deprecated Consider using activateWindow(), use forceActiveWindow() * only if necessary. */ - static void setActiveWindow( WId win ) KDE_DEPRECATED; + static void setActiveWindow( WId win ) TDE_DEPRECATED; /** * When application finishes some operation and wants to notify @@ -502,7 +502,7 @@ public: * @deprecated * Use windowInfo() . */ - static Info info( WId win ) KDE_DEPRECATED; + static Info info( WId win ) TDE_DEPRECATED; #ifdef KDE_NO_COMPAT private: @@ -511,7 +511,7 @@ private: * @deprecated * Use TDEStartupInfo::appStarted */ - static void appStarted() KDE_DEPRECATED; + static void appStarted() TDE_DEPRECATED; }; diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp index a37370e58..e34a012fd 100644 --- a/tdecore/twinmodule.cpp +++ b/tdecore/twinmodule.cpp @@ -22,7 +22,7 @@ */ #include <tqwidget.h> -#ifdef Q_WS_X11 //FIXME +#ifdef TQ_WS_X11 //FIXME #include "twinmodule.h" #include "twin.h" #include <X11/Xatom.h> @@ -71,8 +71,8 @@ public: strutSignalConnected( false ), what( _what ) { - kapp->installX11EventFilter( this ); - (void ) kapp->desktop(); //trigger desktop widget creation to select root window events + tdeApp->installX11EventFilter( this ); + (void ) tdeApp->desktop(); //trigger desktop widget creation to select root window events activate(); updateStackingOrder(); } @@ -445,7 +445,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons void KWinModule::connectNotify( const char* signal ) { - if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 ) + if( !d->strutSignalConnected && qstrcmp( signal, TQ_SIGNAL(strutChanged())) == 0 ) d->strutSignalConnected = true; TQObject::connectNotify( signal ); } @@ -468,13 +468,13 @@ void KWinModule::setDesktopName( int desktop, const TQString& name ) void KWinModule::doNotManage( const TQString& title ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); TQByteArray data, replyData; TQCString replyType; TQDataStream arg(data, IO_WriteOnly); arg << title; - kapp->dcopClient()->call("twin", "", "doNotManage(TQString)", + tdeApp->dcopClient()->call("twin", "", "doNotManage(TQString)", data, replyType, replyData); } diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h index 0357c1c66..356e85958 100644 --- a/tdecore/twinmodule.h +++ b/tdecore/twinmodule.h @@ -27,10 +27,6 @@ #include <tqvaluelist.h> #include "tdelibs_export.h" -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX class KWinModulePrivate; @@ -55,7 +51,7 @@ class KWinModulePrivate; */ class TDECORE_EXPORT KWinModule : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -65,7 +61,7 @@ public: /** * Creates a KWinModule object and connects to the window * manager. - * @param parent the parent for the QObject + * @param parent the parent for the TQObject * @param what The information you are interested in: * INFO_DESKTOP: currentDesktop, * numberOfDesktops, @@ -93,7 +89,7 @@ public: /** * Creates a KWinModule object and connects to the window * manager. - * @param parent the parent for the QObject + * @param parent the parent for the TQObject **/ KWinModule( TQObject* parent = 0 ); |