Request 813 (accepted)
Update to Plasma 5.1.90
Submit package home:sebas:br...el:frameworks / kinfocenter to package home:plfiorin...el:frameworks / kinfocenter
[-] [+] | Changed | kinfocenter.spec |
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/CMakeLists.txt ^ |
@@ -1,5 +1,5 @@ project(kinfocenter) -set(PROJECT_VERSION "5.1.0") +set(PROJECT_VERSION "5.1.90") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.3.0") @@ -26,7 +26,6 @@ KCMUtils KDELibs4Support KIO - Plasma Service Solid WidgetsAddons @@ -115,7 +114,6 @@ KF5::IconThemes KF5::KCMUtils KF5::KDELibs4Support - KF5::Plasma KF5::Service KF5::Solid KF5::WidgetsAddons | ||
[-] [+] | Added | kinfocenter-5.1.90.tar.xz/COPYING.LIB ^ |
@@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/base/info_aix.cpp ^ |
@@ -31,7 +31,7 @@ #undef class #include <nl_types.h> #include <string.h> -#include <kdebug.h> +#include <QDebug> #include <stdlib.h> #include <sys/statfs.h> | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/base/info_netbsd.cpp ^ |
@@ -30,7 +30,7 @@ #include <QTextStream> #include <QTreeWidgetItemIterator> -#include <kdebug.h> +#include <QDebug> #include <kio/global.h> /* for KIO::convertSize() */ typedef struct { | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/base/info_openbsd.cpp ^ |
@@ -26,7 +26,7 @@ #include <QFile> #include <QTextStream> -#include <kdebug.h> +#include <QDebug> typedef struct { int string; | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/dma.desktop ^ |
@@ -130,7 +130,7 @@ Comment[et]=DMA-kanalite info Comment[eu]=DMAri buruzko informazioa Comment[fa]=اطلاعات دسترسی مستقیم به حافظه -Comment[fi]=DMA-tietoja +Comment[fi]=DMA-tietoa Comment[fr]=Informations DMA Comment[fy]=DMA-ynformatie Comment[ga]=Eolas faoi DMA @@ -220,6 +220,7 @@ X-KDE-Keywords[kk]=dma,DMA-Channels,System Information X-KDE-Keywords[km]=dma,DMA-Channels,System Information X-KDE-Keywords[ko]=dma,DMA-Channels,System Information,DMA 채널,시스템 정보 +X-KDE-Keywords[lt]=dma,DMA-Kanalai,Sistemos informacija X-KDE-Keywords[mr]=dma, DMA-चँनल्स, प्रणाली माहीती X-KDE-Keywords[nb]=dma,DMA-kanaler,systeminformasjon X-KDE-Keywords[nds]=DMA,DMA-Kanaals,Systeem-Informatschonen | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/info.cpp ^ |
@@ -25,11 +25,9 @@ #include <QHBoxLayout> #include <QHeaderView> -#include <kglobalsettings.h> #include <kiconloader.h> -#include <kdialog.h> #include <KLocalizedString> -#include <kdebug.h> +#include <QDebug> #include <QFontDatabase> KInfoListWidget::KInfoListWidget(const QString &_title, QWidget *parent, bool _getlistbox(QTreeWidget *tree) ) : @@ -45,12 +43,12 @@ setAboutData(about); - kDebug() << "Constructing a KInfoListWidget..." << endl; + //qDebug() << "Constructing a KInfoListWidget..." << endl; //setButtons(KCModule::Help); getlistbox = _getlistbox; QHBoxLayout *layout = new QHBoxLayout(this); - layout->setSpacing(KDialog::spacingHint()); + //PORT QT5 layout->setSpacing(KDialog::spacingHint()); layout->setMargin(0); widgetStack = new QStackedWidget(this); layout->addWidget(widgetStack); @@ -73,7 +71,7 @@ } void KInfoListWidget::load() { - kDebug() << "Loading KInfoListWidget..." << endl; + //qDebug() << "Loading KInfoListWidget..." << endl; //TODO Remove tree content before clear it tree->clear(); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/interrupts.desktop ^ |
@@ -130,7 +130,7 @@ Comment[et]=Katkestuste info Comment[eu]=Etenei buruzko informazioa Comment[fa]=اطلاعات وقفه -Comment[fi]=Keskeytystietoja +Comment[fi]=Keskeytystietoa Comment[fr]=Informations sur les interruptions Comment[fy]=Underbrekking ynformaasje Comment[ga]=Eolas faoi idirbhristeacha | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/ioports.desktop ^ |
@@ -219,6 +219,7 @@ X-KDE-Keywords[kk]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information X-KDE-Keywords[km]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information X-KDE-Keywords[ko]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information,I/O 포트,포트,시스템 정보 +X-KDE-Keywords[lt]=IO,I/O,IO-Prievadai,I/O-Prievadai,Prievadai,IO-Ruožas,I/O-Ruožas,Sistemos informacija X-KDE-Keywords[mr]=IO, I/O, IO पोर्टस, I/O पोर्टस, पोर्टस, IO रेंज, I/O रेंज, प्रणाली माहीती X-KDE-Keywords[nb]=IO,I/U,IO-porter,porter,IO-område,systeminformasjon X-KDE-Keywords[nds]=In- un Utgaav,IO,I/O,IO-Porten,Porten,IO-Rebeet,Systeem-Informatschonen | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/main.cpp ^ |
@@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kcomponentdata.h> #include <KPluginFactory> #include <KPluginLoader> #include <KLocalizedString> | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/scsi.desktop ^ |
@@ -130,7 +130,7 @@ Comment[et]=SCSI info Comment[eu]=SCSI gailuei buruzko informazioa Comment[fa]=اطلاعات اسکازی -Comment[fi]=SCSI-tietoja +Comment[fi]=SCSI-tietoa Comment[fr]=Informations SCSI Comment[fy]=SCSI-ynformaasje Comment[ga]=Eolas SCSI | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/wayland.desktop ^ |
@@ -24,6 +24,7 @@ Name[ia]=Wayland Name[id]=Wayland Name[ko]=Wayland +Name[lt]=Wayland Name[nb]=Wayland Name[nds]=Wayland Name[nl]=Wayland @@ -55,12 +56,13 @@ Comment[el]=Πληροφορίες σχετικά με τον συνθέτη Wayland Comment[en_GB]=Information about the Wayland Compositor Comment[es]=Información sobre el compositor Wayland -Comment[fi]=Tietoja Wayland-koostimesta +Comment[fi]=Tietoa Wayland-koostimesta Comment[gl]=Información acerca do compositor Wayland Comment[hu]=A Wayland kompozitor jellemzői Comment[ia]=Information re le compositor de Wayland Comment[id]=Informasi tentang Kompositor Wayland Comment[ko]=Wayland 컴포지터 정보 +Comment[lt]=Informacija apie Wayland kompozitorių Comment[nb]=Informasjon om Wayland-sammensetteren Comment[nds]=Informatschonen över de Wayland-Tosamensetten Comment[nl]=Informatie over de Wayland Compositor @@ -97,6 +99,7 @@ X-KDE-Keywords[ia]=Wayland, Compositor, Monstrator, Information de systema X-KDE-Keywords[id]=Wayland,Kompositor,Tampilan,Informasi Sistem X-KDE-Keywords[ko]=Wayland,Compositor,Display,System Information,컴포지터,디스플레이,시스템 정보 +X-KDE-Keywords[lt]=Wayland,Kompozitorius,Ekranas,Sistemos informacija X-KDE-Keywords[nb]=Wayland, Sammensetter,Skjerm,Systeminformasjon X-KDE-Keywords[nds]=Wayland,Tosamensetten,Dorstellen,Systeem-Informatschonen X-KDE-Keywords[nl]=Wayland,Compositor,Scherm,Systeeminformatie | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/info/xserver.desktop ^ |
@@ -218,6 +218,7 @@ X-KDE-Keywords[kk]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information X-KDE-Keywords[km]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information X-KDE-Keywords[ko]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,디스플레이,그래픽 카드,비디오 카드,시스템 정보 +X-KDE-Keywords[lt]=X,X-Server,XServer,XFree86,Ekranas,Video plokštės,Sistemos informacija X-KDE-Keywords[mr]=x, x-सर्व्हर, xसर्व्हर, xफ्री८६, डीसप्ले, व्हिडीओ कार्ड,प्रणाली माहीती X-KDE-Keywords[nb]=X,X-tjener,Xtjener,XFree86,skjerm,Videokort,systeminformasjon X-KDE-Keywords[nds]=X,X-Server,XServer,XFree86,Schirm,Utsehn,Videokoort,System-Informatschonen | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/infosummary/CMakeLists.txt ^ |
@@ -9,7 +9,6 @@ KF5::I18n KF5::Solid KF5::CoreAddons - KF5::Plasma ) install( TARGETS kcm_infosummary DESTINATION ${PLUGIN_INSTALL_DIR} ) | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/infosummary/infosum.cpp ^ |
@@ -20,10 +20,10 @@ * */ +#include <config-workspace.h> #include "infosum.h" #include <KFormat> #include <KLocalizedString> -#include <plasma/version.h> #include <KAboutData> K_PLUGIN_FACTORY(devInfoModuleFactory, registerPlugin<InfoSumPlugin>();) @@ -68,7 +68,7 @@ OsDepInfo *osInfo = new OsDepInfo(); osWidget->setLabelOne(osInfo->osVersion()); - osWidget->setLabelTwo(QString(PLASMA_VERSION_STRING)); + osWidget->setLabelTwo(QString(PROJECT_VERSION)); osWidget->setLabelThree(osInfo->hostName()); osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System")); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/memory/chartWidget.cpp ^ |
@@ -21,6 +21,7 @@ #include <KLocalizedString> #include <KFormat> +#include <QDebug> Chart::Chart(QWidget* parent) : QWidget(parent) { @@ -75,7 +76,7 @@ else localheight = startline; - //kDebug() << "Count : " << count << " Percent : " << percent << "%" << " Localheight:" << localheight << endl; + ////qDebug() << "Count : " << count << " Percent : " << percent << "%" << " Localheight:" << localheight << endl; if (localheight>0) { QLinearGradient gradient(QPointF(1, startline), QPointF(width()-2, -localheight)); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/memory/kcm_memory.desktop ^ |
@@ -129,7 +129,7 @@ Comment[et]=Mäluga seotud info Comment[eu]=Memoriari buruzko informazioa Comment[fa]=اطلاعات حافظه -Comment[fi]=Tietoja muistista +Comment[fi]=Tietoa muistista Comment[fr]=Informations sur la mémoire Comment[fy]=Unthâld ynformaasje Comment[ga]=Faisnéis chuimhne @@ -218,6 +218,7 @@ X-KDE-Keywords[kk]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information X-KDE-Keywords[km]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information X-KDE-Keywords[ko]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,메모리,가상 메모리,스왑 메모리,물리 메모리,공유 메모리,스왑,시스템 정보 +X-KDE-Keywords[lt]=Atmintis,RAM,Virtuali atmintis,Fizinė atmintis,Bendrinama atmintis,Swap,Sistemos informacija X-KDE-Keywords[mr]=मेमरी, RAM, व्हर्च्युअल मेमरी, फिजिकल मेमरी, शेअर्ड मेमरी, स्वॅप, प्रणाली माहीती X-KDE-Keywords[nb]=Minne,RAM,Virtuelt minne,Fysisk minne,Delt minne,Veksleminne,Systeminformasjon X-KDE-Keywords[nds]=Spieker,RAM,virtuell,physikaalsch,deelt,Utlagerspieker,Systeeminformatschonen | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/nics/CMakeLists.txt ^ |
@@ -22,7 +22,7 @@ add_library(kcm_nic MODULE ${kcm_nic_PART_SRCS}) -target_link_libraries(kcm_nic KF5::KCMUtils KF5::I18n KF5::KDELibs4Support ) +target_link_libraries(kcm_nic KF5::KCMUtils KF5::I18n KF5::CoreAddons ) install(TARGETS kcm_nic DESTINATION ${PLUGIN_INSTALL_DIR} ) | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/nics/nic.cpp ^ |
@@ -34,7 +34,6 @@ #endif #include <kaboutdata.h> -#include <kdialog.h> #include <KLocalizedString> #include <QPushButton> @@ -89,7 +88,7 @@ KCModule(parent) { QVBoxLayout *box=new QVBoxLayout(this); box->setMargin(0); - box->setSpacing(KDialog::spacingHint()); + //PORT QT5 box->setSpacing(KDialog::spacingHint()); m_list=new QTreeWidget(this); m_list->setRootIsDecorated(false); box->addWidget(m_list); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/pci/kcm_pci.cpp ^ |
@@ -23,16 +23,13 @@ #include <KPluginLoader> #include <kaboutdata.h> -#include <kdialog.h> -#include <kdebug.h> +#include <QDebug> #include <QHBoxLayout> #include <QTreeWidget> -#include <klocale.h> #include <KLocalizedString> -#include <kglobal.h> #include <kseparator.h> K_PLUGIN_FACTORY(KCMPciFactory, @@ -73,7 +70,7 @@ } void KCMPci::load() { - kDebug() << "Loading PCI information..." << endl; + //qDebug() << "Loading PCI information..." << endl; GetInfo_PCI(tree); //Resize the column width to the maximum needed | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/pci/kcm_pci.desktop ^ |
@@ -128,7 +128,7 @@ Comment[et]=PCI info Comment[eu]=PCIri buruzko informazioa Comment[fa]=اطلاعات PCI -Comment[fi]=PCI-tietoja +Comment[fi]=PCI-tietoa Comment[fr]=Informations PCI Comment[fy]=PCI-Ynformaasje Comment[ga]=Eolas PCI | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/samba/kcmsambalog.cpp ^ |
@@ -33,7 +33,6 @@ #include <KLocalizedString> #include "kcmsambalog.h" -#include "kcmsambalog.moc" #define LOG_SCREEN_XY_OFFSET 10 | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/samba/kcmsambastatistics.cpp ^ |
@@ -35,7 +35,7 @@ #include <QVBoxLayout> #include <KLocale> -#include <KDebug> +#include <QDebug> #include <KDialog> #include <KLocalizedString> @@ -242,7 +242,7 @@ } void SambaLog::printItems() { - kDebug() << "****** printing items: ******"; + //qDebug() << "****** printing items: ******"; foreach (const LogItem *tmpItem, items) { if (!tmpItem) @@ -250,17 +250,17 @@ continue; } - kDebug() << "SERVICE: " << tmpItem->name; + //qDebug() << "SERVICE: " << tmpItem->name; foreach (const SmallLogItem *tmpLog, tmpItem->accessed) { if (!tmpLog) { continue; } - kDebug() << " accessed by: " << tmpLog->name << " " << tmpLog->count; + //qDebug() << " accessed by: " << tmpLog->name << " " << tmpLog->count; } } - kDebug() << "------ end of printing ------"; + //qDebug() << "------ end of printing ------"; } LogItem* SambaLog::itemInList(const QString &name) { | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/samba/ksmbstatus.cpp ^ |
@@ -27,9 +27,9 @@ #include <kdialog.h> #include <QBoxLayout> +#include <QDebug> #include "ksmbstatus.h" -#include "ksmbstatus.moc" #define Before(ttf,in) in.left(in.indexOf(ttf)) #define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.indexOf(ttf)+QString(ttf).length())):QString("")) @@ -125,7 +125,7 @@ qint64 buflen = 8046; // 8k enough? char buffer[buflen]; buflen = process->readLine(buffer, buflen); - //kDebug()<<"received stuff"; + ////qDebug()<<"received stuff"; char s[250], *start, *end; size_t len; start = buffer; @@ -136,7 +136,7 @@ len=sizeof(s)-1; strncpy(s, start, len); s[len] = '\0'; - //kDebug() << "recived: "<<s; + ////qDebug() << "recived: "<<s; if (readingpart==nfs) processNFSLine(s, len); else @@ -197,7 +197,7 @@ //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running QTimer::singleShot(5000,this,SLOT(killShowmount())); - //kDebug()<<"starting kill timer with 5 seconds"; + ////qDebug()<<"starting kill timer with 5 seconds"; connect(showmountProc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &NetMon::killShowmount); connect(showmountProc, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this, &NetMon::killShowmount); showmountProc->start("showmount", QStringList() << "-a" << "localhost"); @@ -207,7 +207,7 @@ } void NetMon::killShowmount() { - //kDebug()<<"killShowmount()"; + ////qDebug()<<"killShowmount()"; showmountProc->deleteLater(); showmountProc=0; } | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/Modules/view1394/view1394.cpp ^ |
@@ -26,14 +26,11 @@ #include <QTreeWidgetItem> #include <QTreeWidget> #include <QVBoxLayout> +#include <KLocalizedString> -#include <kcomponentdata.h> -#include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> -#include <kstandarddirs.h> #include <kpluginfactory.h> #include <kpluginloader.h> +#include <KDialog> #include <sys/time.h> #include <sys/types.h> @@ -43,6 +40,7 @@ #include <string.h> #include <libraw1394/csr.h> +#include <QStandardPaths> #define CONFIGROM_BASE 0x00 #define CONFIGROM_CAP 0x08 @@ -276,7 +274,7 @@ } OuiDb::OuiDb() { - QString filename=KStandardDirs::locate("data", "kcmview1394/oui.db"); + QString filename=QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmview1394/oui.db"); if (filename.isEmpty()) return; QFile f(filename); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/config-workspace.h.cmake ^ |
@@ -156,4 +156,4 @@ /* type to use in place of socklen_t if not defined */ #define kde_socklen_t socklen_t -#define WORKSPACE_VERSION_STRING "${KDE4WORKSPACE_VERSION}" \ No newline at end of file +#define PROJECT_VERSION "${PROJECT_VERSION}" \ No newline at end of file | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/infokcmmodel.cpp ^ |
@@ -26,7 +26,7 @@ //KDE #include <KServiceTypeTrader> -#include <KDebug> +#include <QDebug> #include <KLocalizedString> InfoKcmModel::InfoKcmModel(QObject *parent) : QAbstractItemModel(parent), m_root(new KcmCategoryItem(i18n("Information Modules"))) @@ -63,7 +63,7 @@ if(lost != NULL) { lost->addChild(new KcmTreeItem(kcmModule,lost)); } else { - kWarning() << "Lost and found category not found, unable to display lost Kcontrol modules"; + qWarning() << "Lost and found category not found, unable to display lost Kcontrol modules"; } } } else { | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/kcontrol/menus/kinfocenter.directory ^ |
@@ -7,6 +7,7 @@ Name[cs]=Informace Name[da]=Information Name[de]=Information +Name[el]=Πληροφορίες Name[en_GB]=Information Name[es]=Información Name[fi]=Tiedot @@ -15,6 +16,7 @@ Name[ia]=Information Name[id]=Informasi Name[ko]=정보 +Name[lt]=Informacija Name[nb]=Informasjon Name[nds]=Informatschoon Name[nl]=Informatie | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/main.cpp ^ |
@@ -36,6 +36,7 @@ : QApplication(argc, argv) { QApplication::setApplicationDisplayName(i18n("KDE Info Center")); + QApplication::setOrganizationDomain("kde.org"); display = new KInfoCenter(); display->show(); @@ -50,6 +51,7 @@ PROJECT_VERSION, i18n("The KDE Info Center"), KAboutLicense::GPL, i18n("(c) 2009-2010, The KDE SC KInfocenter Development Team")); + aboutData.setProgramIconName("hwinfo"); aboutData.addAuthor(i18n("David Hubner"),i18n("Current Maintainer"), QStringLiteral("hubnerd@ntlworld.com")); aboutData.addAuthor(i18n("Helge Deller"), i18n("Previous Maintainer"), QStringLiteral("deller@kde.org")); aboutData.addAuthor(i18n("Matthias Hoelzer-Kluepfel"),QString(), QStringLiteral("hoelzer@kde.org")); | ||
[-] [+] | Changed | kinfocenter-5.1.90.tar.xz/main.h ^ |
@@ -24,7 +24,7 @@ #define INFOCENTERMAIN //KDE -#include <kapplication.h> +#include <qapplication.h> //Local #include "infocenter.h" | ||
[-] [+] | Changed | kinfocenter.yaml ^ |
@@ -1,5 +1,5 @@ Name : kinfocenter -Version : 5.1.0 +Version : 5.1.90 Release : 1 Group : System/Base License : GPLv2+ |