mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-24 02:42:50 +00:00
generic: compiler warning fixes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
ed38160cdd
commit
08bd97aff5
55 changed files with 60 additions and 134 deletions
|
@ -48,7 +48,7 @@ private:
|
||||||
|
|
||||||
QCheckBox *systemBell, *customBell, *visibleBell;
|
QCheckBox *systemBell, *customBell, *visibleBell;
|
||||||
QRadioButton *invertScreen, *flashScreen;
|
QRadioButton *invertScreen, *flashScreen;
|
||||||
QLabel *soundLabel, *colorLabel;
|
QLabel *soundLabel;
|
||||||
QLineEdit *soundEdit;
|
QLineEdit *soundEdit;
|
||||||
QPushButton *soundButton;
|
QPushButton *soundButton;
|
||||||
KColorButton *colorButton;
|
KColorButton *colorButton;
|
||||||
|
|
|
@ -78,8 +78,6 @@ private:
|
||||||
QTimer internalTimer;
|
QTimer internalTimer;
|
||||||
|
|
||||||
QString timeServer;
|
QString timeServer;
|
||||||
int BufI;
|
|
||||||
bool refresh;
|
|
||||||
bool ontimeout;
|
bool ontimeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ public:
|
||||||
void load();
|
void load();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QTabWidget *tab;
|
|
||||||
Dtime *dtime;
|
Dtime *dtime;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -100,8 +100,7 @@ private:
|
||||||
|
|
||||||
QListWidget *mpUsageList;
|
QListWidget *mpUsageList;
|
||||||
QComboBox *mpSizeBox;
|
QComboBox *mpSizeBox;
|
||||||
QCheckBox *wordWrapCB, *underlineCB, *mpAnimatedCheck;
|
QCheckBox *mpAnimatedCheck;
|
||||||
QTabWidget *m_pTabWidget;
|
|
||||||
QWidget *m_pTab1;
|
QWidget *m_pTab1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -227,7 +227,7 @@ EFileType check(const QString &file, Family &fam)
|
||||||
foundry;
|
foundry;
|
||||||
quint32 style;
|
quint32 style;
|
||||||
int index;
|
int index;
|
||||||
qulonglong ws;
|
qulonglong ws = 0;
|
||||||
EFileType type=(FcResultMatch!=FcPatternGetBool(pat, FC_SCALABLE, 0, &scalable) || !scalable)
|
EFileType type=(FcResultMatch!=FcPatternGetBool(pat, FC_SCALABLE, 0, &scalable) || !scalable)
|
||||||
? FILE_BITMAP : FILE_SCALABLE;
|
? FILE_BITMAP : FILE_SCALABLE;
|
||||||
|
|
||||||
|
|
|
@ -174,9 +174,7 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const QVariantList&)
|
||||||
: KCModule(FontInstallFactory::componentData(), parent),
|
: KCModule(FontInstallFactory::componentData(), parent),
|
||||||
itsPreview(NULL),
|
itsPreview(NULL),
|
||||||
itsConfig(KFI_UI_CFG_FILE),
|
itsConfig(KFI_UI_CFG_FILE),
|
||||||
itsJob(NULL),
|
|
||||||
itsProgress(NULL),
|
itsProgress(NULL),
|
||||||
itsUpdateDialog(NULL),
|
|
||||||
itsTempDir(NULL),
|
itsTempDir(NULL),
|
||||||
itsPrintProc(NULL),
|
itsPrintProc(NULL),
|
||||||
itsDownloadFontsAct(NULL)
|
itsDownloadFontsAct(NULL)
|
||||||
|
|
|
@ -26,7 +26,12 @@
|
||||||
|
|
||||||
#include "GroupList.h"
|
#include "GroupList.h"
|
||||||
#include "JobRunner.h"
|
#include "JobRunner.h"
|
||||||
#include <QtCore/QSet>
|
#include <QSet>
|
||||||
|
#include <QLabel>
|
||||||
|
#include <QMenu>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QSplitter>
|
||||||
|
#include <QComboBox>
|
||||||
#include <KCModule>
|
#include <KCModule>
|
||||||
#include <KUrl>
|
#include <KUrl>
|
||||||
#include <KConfig>
|
#include <KConfig>
|
||||||
|
@ -38,11 +43,6 @@ class KTempDir;
|
||||||
class KToggleAction;
|
class KToggleAction;
|
||||||
class KActionMenu;
|
class KActionMenu;
|
||||||
class KAction;
|
class KAction;
|
||||||
#include <QLabel>
|
|
||||||
#include <QMenu>
|
|
||||||
#include <QProcess>
|
|
||||||
#include <QSplitter>
|
|
||||||
#include <QComboBox>
|
|
||||||
|
|
||||||
namespace KFI
|
namespace KFI
|
||||||
{
|
{
|
||||||
|
@ -124,14 +124,11 @@ class CKCmFontInst : public KCModule
|
||||||
*itsDeleteFontControl;
|
*itsDeleteFontControl;
|
||||||
CFontFilter *itsFilter;
|
CFontFilter *itsFilter;
|
||||||
QString itsLastStatusBarMsg;
|
QString itsLastStatusBarMsg;
|
||||||
KIO::Job *itsJob;
|
|
||||||
KProgressDialog *itsProgress;
|
KProgressDialog *itsProgress;
|
||||||
CUpdateDialog *itsUpdateDialog;
|
|
||||||
KTempDir *itsTempDir;
|
KTempDir *itsTempDir;
|
||||||
QProcess *itsPrintProc;
|
QProcess *itsPrintProc;
|
||||||
QSet<QString> itsDeletedFonts;
|
QSet<QString> itsDeletedFonts;
|
||||||
KUrl::List itsModifiedUrls;
|
KUrl::List itsModifiedUrls;
|
||||||
CJobRunner *itsRunner;
|
|
||||||
QMenu *itsPreviewMenu,
|
QMenu *itsPreviewMenu,
|
||||||
*itsPreviewListMenu;
|
*itsPreviewListMenu;
|
||||||
KAction *itsDownloadFontsAct;
|
KAction *itsDownloadFontsAct;
|
||||||
|
|
|
@ -49,7 +49,7 @@ class KDE_EXPORT CFcEngine
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
struct Xft;
|
class Xft;
|
||||||
|
|
||||||
struct TRange
|
struct TRange
|
||||||
{
|
{
|
||||||
|
|
|
@ -415,8 +415,7 @@ QMap<QString, QString> getFontFileMap(const QSet<QString> &files)
|
||||||
{
|
{
|
||||||
QVector<QString> orig(fIt.value().count()),
|
QVector<QString> orig(fIt.value().count()),
|
||||||
modified(fIt.value().count());
|
modified(fIt.value().count());
|
||||||
QSet<QString>::ConstIterator oIt(fIt.value().constBegin()),
|
QSet<QString>::ConstIterator oIt(fIt.value().constBegin());
|
||||||
oEnd(fIt.value().constEnd());
|
|
||||||
bool good=true;
|
bool good=true;
|
||||||
int count=fIt.value().count();
|
int count=fIt.value().count();
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,6 @@ class CFontViewPart : public KParts::ReadOnlyPart
|
||||||
// *itsMetaLabel;
|
// *itsMetaLabel;
|
||||||
KIntNumInput *itsFaceSelector;
|
KIntNumInput *itsFaceSelector;
|
||||||
QAction *itsChangeTextAction;
|
QAction *itsChangeTextAction;
|
||||||
int itsFace;
|
|
||||||
KSharedConfigPtr itsConfig;
|
KSharedConfigPtr itsConfig;
|
||||||
BrowserExtension *itsExtension;
|
BrowserExtension *itsExtension;
|
||||||
QProcess *itsProc;
|
QProcess *itsProc;
|
||||||
|
|
|
@ -229,8 +229,6 @@ LaunchConfig::checkChanged()
|
||||||
|
|
||||||
c = conf.group("BusyCursorSettings");
|
c = conf.group("BusyCursorSettings");
|
||||||
unsigned int savedCursorTimeout = c.readEntry( "Timeout", 30 );
|
unsigned int savedCursorTimeout = c.readEntry( "Timeout", 30 );
|
||||||
bool savedBusyBlinking =c.readEntry("Blinking", false);
|
|
||||||
bool savedBusyBouncing =c.readEntry("Bouncing", true);
|
|
||||||
|
|
||||||
c = conf.group("TaskbarButtonSettings");
|
c = conf.group("TaskbarButtonSettings");
|
||||||
unsigned int savedTaskbarTimeout = c.readEntry( "Timeout", 30 );
|
unsigned int savedTaskbarTimeout = c.readEntry( "Timeout", 30 );
|
||||||
|
|
|
@ -37,7 +37,6 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
KRandRSystemTray *m_tray;
|
KRandRSystemTray *m_tray;
|
||||||
RandRConfig *m_widget;
|
|
||||||
RandRDisplay *m_display;
|
RandRDisplay *m_display;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
KRandRSystemTray::KRandRSystemTray(RandRDisplay *dpy, QWidget* parent)
|
KRandRSystemTray::KRandRSystemTray(RandRDisplay *dpy, QWidget* parent)
|
||||||
: KStatusNotifierItem(parent),
|
: KStatusNotifierItem(parent),
|
||||||
m_help(new KHelpMenu(parent, KGlobal::mainComponent().aboutData(), false, actionCollection())),
|
m_help(new KHelpMenu(parent, KGlobal::mainComponent().aboutData(), false, actionCollection())),
|
||||||
m_popupUp(false),
|
|
||||||
m_display(dpy)
|
m_display(dpy)
|
||||||
{
|
{
|
||||||
setIconByName("preferences-desktop-display-randr");
|
setIconByName("preferences-desktop-display-randr");
|
||||||
|
|
|
@ -63,7 +63,6 @@ private:
|
||||||
QActionGroup *populateRates(KMenu *menu, const RateList &rates, float rate);
|
QActionGroup *populateRates(KMenu *menu, const RateList &rates, float rate);
|
||||||
|
|
||||||
KHelpMenu* m_help;
|
KHelpMenu* m_help;
|
||||||
bool m_popupUp;
|
|
||||||
QList<KMenu*> m_screenPopups;
|
QList<KMenu*> m_screenPopups;
|
||||||
KMenu* m_menu;
|
KMenu* m_menu;
|
||||||
RandRDisplay *m_display;
|
RandRDisplay *m_display;
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
LegacyRandRScreen::LegacyRandRScreen(int screenIndex)
|
LegacyRandRScreen::LegacyRandRScreen(int screenIndex)
|
||||||
: m_config(0L)
|
: m_config(0L)
|
||||||
, m_screen(screenIndex)
|
, m_screen(screenIndex)
|
||||||
, m_shownDialog(NULL)
|
|
||||||
{
|
{
|
||||||
loadSettings();
|
loadSettings();
|
||||||
setOriginal();
|
setOriginal();
|
||||||
|
|
|
@ -152,8 +152,6 @@ private:
|
||||||
int m_proposedSize;
|
int m_proposedSize;
|
||||||
int m_proposedRefreshRate;
|
int m_proposedRefreshRate;
|
||||||
|
|
||||||
KTimerDialog* m_shownDialog;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -87,7 +87,6 @@ signals:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static bool isRelativeTo( QRect rect, QRect to, Relation rel );
|
static bool isRelativeTo( QRect rect, QRect to, Relation rel );
|
||||||
int m_changes;
|
|
||||||
bool m_changed;
|
bool m_changed;
|
||||||
bool m_unified;
|
bool m_unified;
|
||||||
QPoint m_pos;
|
QPoint m_pos;
|
||||||
|
|
|
@ -75,7 +75,6 @@ protected:
|
||||||
private:
|
private:
|
||||||
void insufficientVirtualSize();
|
void insufficientVirtualSize();
|
||||||
RandRDisplay *m_display;
|
RandRDisplay *m_display;
|
||||||
bool m_firstLoad;
|
|
||||||
|
|
||||||
SettingsContainer *m_container;
|
SettingsContainer *m_container;
|
||||||
QList<CollapsibleWidget*> m_outputList;
|
QList<CollapsibleWidget*> m_outputList;
|
||||||
|
|
|
@ -154,7 +154,6 @@ protected:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
RROutput m_id;
|
RROutput m_id;
|
||||||
XRROutputInfo* m_info;
|
|
||||||
QString m_name;
|
QString m_name;
|
||||||
QString m_alias;
|
QString m_alias;
|
||||||
|
|
||||||
|
|
|
@ -21,16 +21,16 @@
|
||||||
#define FILETYPEDETAILS_H
|
#define FILETYPEDETAILS_H
|
||||||
|
|
||||||
#include <QTabWidget>
|
#include <QTabWidget>
|
||||||
|
|
||||||
class KIconButton;
|
|
||||||
class MimeTypeData;
|
|
||||||
class TypesListItem;
|
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QListWidget>
|
#include <QListWidget>
|
||||||
#include <QGroupBox>
|
#include <QGroupBox>
|
||||||
#include <QButtonGroup>
|
#include <QButtonGroup>
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QRadioButton>
|
#include <QRadioButton>
|
||||||
|
|
||||||
|
class KIconButton;
|
||||||
|
class MimeTypeData;
|
||||||
|
class TypesListItem;
|
||||||
class KLineEdit;
|
class KLineEdit;
|
||||||
class KPushButton;
|
class KPushButton;
|
||||||
class KServiceListWidget;
|
class KServiceListWidget;
|
||||||
|
@ -96,7 +96,6 @@ private:
|
||||||
QGroupBox *m_autoEmbedBox;
|
QGroupBox *m_autoEmbedBox;
|
||||||
QButtonGroup *m_autoEmbedGroup;
|
QButtonGroup *m_autoEmbedGroup;
|
||||||
KServiceListWidget *embedServiceListWidget;
|
KServiceListWidget *embedServiceListWidget;
|
||||||
QRadioButton *m_rbOpenSeparate;
|
|
||||||
QCheckBox *m_chkAskSave;
|
QCheckBox *m_chkAskSave;
|
||||||
QRadioButton *m_rbGroupSettings;
|
QRadioButton *m_rbGroupSettings;
|
||||||
};
|
};
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
ImportsView::ImportsView(QWidget * parent, KConfig *config) :
|
ImportsView::ImportsView(QWidget * parent) :
|
||||||
QWidget(parent), configFile(config), list(this) {
|
QWidget(parent), list(this) {
|
||||||
QBoxLayout *topLayout = new QVBoxLayout(this);
|
QBoxLayout *topLayout = new QVBoxLayout(this);
|
||||||
topLayout->setMargin(KDialog::marginHint());
|
topLayout->setMargin(KDialog::marginHint());
|
||||||
topLayout->setSpacing(KDialog::spacingHint());
|
topLayout->setSpacing(KDialog::spacingHint());
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
class ImportsView : public QWidget {
|
class ImportsView : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit ImportsView(QWidget *parent, KConfig *config=0);
|
explicit ImportsView(QWidget *parent);
|
||||||
virtual ~ImportsView() {
|
virtual ~ImportsView() {
|
||||||
}
|
}
|
||||||
void saveSettings() {
|
void saveSettings() {
|
||||||
|
@ -40,7 +40,6 @@ public:
|
||||||
void loadSettings() {
|
void loadSettings() {
|
||||||
}
|
}
|
||||||
private:
|
private:
|
||||||
KConfig *configFile;
|
|
||||||
QTreeWidget list;
|
QTreeWidget list;
|
||||||
QTimer timer;
|
QTimer timer;
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
|
|
|
@ -38,8 +38,8 @@
|
||||||
#include <KGlobal>
|
#include <KGlobal>
|
||||||
#include <KLocale>
|
#include <KLocale>
|
||||||
|
|
||||||
StatisticsView::StatisticsView(QWidget *parent, KConfig *config) :
|
StatisticsView::StatisticsView(QWidget *parent) :
|
||||||
QWidget(parent), configFile(config), dataList(0), connectionsCount(0), filesCount(0), calcCount(0) {
|
QWidget(parent), dataList(0), connectionsCount(0), filesCount(0), calcCount(0) {
|
||||||
viewStatistics = new QTreeWidget( this );
|
viewStatistics = new QTreeWidget( this );
|
||||||
connectionsL = new QLabel( i18n( "Connections: 0" ), this );
|
connectionsL = new QLabel( i18n( "Connections: 0" ), this );
|
||||||
connectionsL->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
connectionsL->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
||||||
|
|
|
@ -83,7 +83,7 @@ private:
|
||||||
class StatisticsView : public QWidget {
|
class StatisticsView : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit StatisticsView(QWidget *parent=0, KConfig *config=0);
|
explicit StatisticsView(QWidget *parent=0);
|
||||||
virtual ~StatisticsView() {
|
virtual ~StatisticsView() {
|
||||||
}
|
}
|
||||||
void saveSettings() {
|
void saveSettings() {
|
||||||
|
@ -93,7 +93,6 @@ public:
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void setListInfo(QTreeWidget *list, int nrOfFiles, int nrOfConnections);
|
void setListInfo(QTreeWidget *list, int nrOfFiles, int nrOfConnections);
|
||||||
private:
|
private:
|
||||||
KConfig *configFile;
|
|
||||||
QTreeWidget* dataList;
|
QTreeWidget* dataList;
|
||||||
QTreeWidget* viewStatistics;
|
QTreeWidget* viewStatistics;
|
||||||
QLabel* connectionsL, *filesL;
|
QLabel* connectionsL, *filesL;
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#define Before(ttf,in) in.left(in.indexOf(ttf))
|
#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(""))
|
#define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.indexOf(ttf)+QString(ttf).length())):QString(""))
|
||||||
|
|
||||||
NetMon::NetMon(QWidget * parent, KConfig *config) :
|
NetMon::NetMon(QWidget * parent) :
|
||||||
QWidget(parent), configFile(config), showmountProc(0), strShare(""), strUser(""), strGroup(""), strMachine(""), strSince(""), strPid(""), iUser(0), iGroup(0), iMachine(0), iPid(0) {
|
QWidget(parent), showmountProc(0), strShare(""), strUser(""), strGroup(""), strMachine(""), strSince(""), strPid(""), iUser(0), iGroup(0), iMachine(0), iPid(0) {
|
||||||
QBoxLayout *topLayout = new QVBoxLayout(this);
|
QBoxLayout *topLayout = new QVBoxLayout(this);
|
||||||
topLayout->setMargin(KDialog::marginHint());
|
topLayout->setMargin(KDialog::marginHint());
|
||||||
topLayout->setSpacing(KDialog::spacingHint());
|
topLayout->setSpacing(KDialog::spacingHint());
|
||||||
|
|
|
@ -31,13 +31,12 @@
|
||||||
class NetMon : public QWidget {
|
class NetMon : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit NetMon(QWidget *parent, KConfig * config=0);
|
explicit NetMon(QWidget *parent);
|
||||||
void saveSettings() {
|
void saveSettings() {
|
||||||
}
|
}
|
||||||
void loadSettings() {
|
void loadSettings() {
|
||||||
}
|
}
|
||||||
private:
|
private:
|
||||||
KConfig *configFile;
|
|
||||||
QProcess *showmountProc;
|
QProcess *showmountProc;
|
||||||
QTreeWidget *list;
|
QTreeWidget *list;
|
||||||
QLabel *version;
|
QLabel *version;
|
||||||
|
|
|
@ -52,7 +52,7 @@ K_PLUGIN_FACTORY(SambaFactory,
|
||||||
K_EXPORT_PLUGIN(SambaFactory("kcmsamba"))
|
K_EXPORT_PLUGIN(SambaFactory("kcmsamba"))
|
||||||
|
|
||||||
SambaContainer::SambaContainer(QWidget *parent, const QVariantList&) :
|
SambaContainer::SambaContainer(QWidget *parent, const QVariantList&) :
|
||||||
KCModule(SambaFactory::componentData(), parent), config("kcmsambarc"), tabs(this), status(&tabs, &config), imports(&tabs, &config), logView(&tabs, &config), statisticsView(&tabs, &config) {
|
KCModule(SambaFactory::componentData(), parent), config("kcmsambarc"), tabs(this), status(&tabs), imports(&tabs), logView(&tabs, &config), statisticsView(&tabs) {
|
||||||
QVBoxLayout *layout = new QVBoxLayout( this );
|
QVBoxLayout *layout = new QVBoxLayout( this );
|
||||||
layout->setMargin(0);
|
layout->setMargin(0);
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
#include <QTimer>
|
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QEventLoop>
|
#include <QEventLoop>
|
||||||
|
|
||||||
|
@ -38,7 +37,6 @@ class CachedDevice : public QObject
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qint32 timeout;
|
qint32 timeout;
|
||||||
QTimer *timer;
|
|
||||||
LIBMTP_mtpdevice_t* mtpdevice;
|
LIBMTP_mtpdevice_t* mtpdevice;
|
||||||
LIBMTP_raw_device_t rawdevice;
|
LIBMTP_raw_device_t rawdevice;
|
||||||
|
|
||||||
|
|
|
@ -823,7 +823,7 @@ void MTPSlave::mkdir ( const KUrl& url, int )
|
||||||
kDebug ( KIO_MTP ) << url.path();
|
kDebug ( KIO_MTP ) << url.path();
|
||||||
|
|
||||||
QStringList pathItems = url.path().split ( QLatin1Char ( '/' ) , QString::SkipEmptyParts );
|
QStringList pathItems = url.path().split ( QLatin1Char ( '/' ) , QString::SkipEmptyParts );
|
||||||
int pathDepth= pathItems.size();
|
int pathDepth= pathItems.size();
|
||||||
|
|
||||||
if ( pathItems.size() > 2 && !getPath ( url.path() ).first )
|
if ( pathItems.size() > 2 && !getPath ( url.path() ).first )
|
||||||
{
|
{
|
||||||
|
@ -831,19 +831,18 @@ void MTPSlave::mkdir ( const KUrl& url, int )
|
||||||
|
|
||||||
LIBMTP_mtpdevice_t *device;
|
LIBMTP_mtpdevice_t *device;
|
||||||
LIBMTP_file_t *file;
|
LIBMTP_file_t *file;
|
||||||
LIBMTP_devicestorage_t *storage;
|
LIBMTP_devicestorage_t *storage;
|
||||||
int ret;
|
int ret = 0;
|
||||||
|
|
||||||
QPair<void*, LIBMTP_mtpdevice_t*> pair = getPath ( url.directory() );
|
QPair<void*, LIBMTP_mtpdevice_t*> pair = getPath ( url.directory() );
|
||||||
|
|
||||||
if (pathDepth == 3)
|
if (pathDepth == 3)
|
||||||
{//the folder need to be created straight to a storage device
|
{ //the folder need to be created straight to a storage device
|
||||||
storage= ( LIBMTP_devicestorage_t* ) pair.first;
|
storage= ( LIBMTP_devicestorage_t* ) pair.first;
|
||||||
device = pair.second;
|
device = pair.second;
|
||||||
ret = LIBMTP_Create_Folder ( device, dirName, 0xFFFFFFFF, storage->id );
|
ret = LIBMTP_Create_Folder ( device, dirName, 0xFFFFFFFF, storage->id );
|
||||||
}
|
}
|
||||||
else
|
else if ( pair.first )
|
||||||
if ( pair.first )
|
|
||||||
{
|
{
|
||||||
file = ( LIBMTP_file_t* ) pair.first;
|
file = ( LIBMTP_file_t* ) pair.first;
|
||||||
device = pair.second;
|
device = pair.second;
|
||||||
|
@ -857,17 +856,17 @@ void MTPSlave::mkdir ( const KUrl& url, int )
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( ret != 0 )
|
if ( ret != 0 )
|
||||||
{
|
{
|
||||||
fileCache->addPath( url.path(), ret );
|
fileCache->addPath( url.path(), ret );
|
||||||
finished();
|
finished();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LIBMTP_Dump_Errorstack ( device );
|
LIBMTP_Dump_Errorstack ( device );
|
||||||
LIBMTP_Clear_Errorstack ( device );
|
LIBMTP_Clear_Errorstack ( device );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
#include <KComponentData>
|
#include <KComponentData>
|
||||||
#include <KRecentDocument>
|
#include <KRecentDocument>
|
||||||
#include <KDirWatch>
|
|
||||||
#include <KDesktopFile>
|
#include <KDesktopFile>
|
||||||
#include <KStandardDirs>
|
#include <KStandardDirs>
|
||||||
#include <KIO/Job>
|
#include <KIO/Job>
|
||||||
|
|
|
@ -19,8 +19,6 @@ protected:
|
||||||
virtual void stat(const KUrl& url);
|
virtual void stat(const KUrl& url);
|
||||||
virtual void mimetype(const KUrl& url);
|
virtual void mimetype(const KUrl& url);
|
||||||
virtual void del(const KUrl& url, bool isfile);
|
virtual void del(const KUrl& url, bool isfile);
|
||||||
private:
|
|
||||||
KDirWatch* m_recentDocWatch;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -106,9 +106,6 @@ private: // Private variables
|
||||||
|
|
||||||
ssh_callbacks mCallbacks;
|
ssh_callbacks mCallbacks;
|
||||||
|
|
||||||
/** Version of the sftp protocol we are using. */
|
|
||||||
int sftpVersion;
|
|
||||||
|
|
||||||
struct Status
|
struct Status
|
||||||
{
|
{
|
||||||
int code;
|
int code;
|
||||||
|
|
|
@ -171,7 +171,6 @@ private:
|
||||||
mutable TrashDirMap m_topDirectories; // id -> $topdir of partition
|
mutable TrashDirMap m_topDirectories; // id -> $topdir of partition
|
||||||
dev_t m_homeDevice;
|
dev_t m_homeDevice;
|
||||||
mutable bool m_trashDirectoriesScanned;
|
mutable bool m_trashDirectoriesScanned;
|
||||||
int m_mibEnum;
|
|
||||||
|
|
||||||
KConfig m_config;
|
KConfig m_config;
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,7 @@
|
||||||
#include "knotifyplugin.h"
|
#include "knotifyplugin.h"
|
||||||
|
|
||||||
KNotifyPlugin::KNotifyPlugin(QObject *parent, const QVariantList &args)
|
KNotifyPlugin::KNotifyPlugin(QObject *parent, const QVariantList &args)
|
||||||
: QObject(parent),
|
: QObject(parent)
|
||||||
d(0)
|
|
||||||
{
|
{
|
||||||
Q_UNUSED(args);
|
Q_UNUSED(args);
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include "knotify_export.h"
|
#include "knotify_export.h"
|
||||||
|
|
||||||
class KNotifyPluginPrivate;
|
|
||||||
class KNotifyConfig;
|
class KNotifyConfig;
|
||||||
|
|
||||||
|
|
||||||
|
@ -99,9 +98,6 @@ class KNOTIFY_EXPORT KNotifyPlugin : public QObject
|
||||||
*/
|
*/
|
||||||
void actionInvoked(int id , int action);
|
void actionInvoked(int id , int action);
|
||||||
|
|
||||||
private:
|
|
||||||
KNotifyPluginPrivate *const d;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define K_EXPORT_KNOTIFY_METHOD(libname,classname) \
|
#define K_EXPORT_KNOTIFY_METHOD(libname,classname) \
|
||||||
|
|
|
@ -168,8 +168,8 @@ draw_pool (m_state *state)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if( state->show_threads )
|
if( state->show_threads ) {
|
||||||
if( state->modified[index] == 1 )
|
if( state->modified[index] == 1 ) {
|
||||||
pos_x += 2;
|
pos_x += 2;
|
||||||
QPainter p(state->w);
|
QPainter p(state->w);
|
||||||
p.setPen( Qt::green );
|
p.setPen( Qt::green );
|
||||||
|
@ -179,6 +179,8 @@ draw_pool (m_state *state)
|
||||||
state->images, pos_x*state->char_width,
|
state->images, pos_x*state->char_width,
|
||||||
pos_y*state->char_height,
|
pos_y*state->char_height,
|
||||||
state->char_width, state->char_height );
|
state->char_width, state->char_height );
|
||||||
|
}
|
||||||
|
}
|
||||||
--state->modified[index];
|
--state->modified[index];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,7 @@ KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
|
||||||
|
|
||||||
KSMShutdownFeedback::KSMShutdownFeedback()
|
KSMShutdownFeedback::KSMShutdownFeedback()
|
||||||
: QWidget( 0L, Qt::Popup ),
|
: QWidget( 0L, Qt::Popup ),
|
||||||
m_currentY( 0 ), initialized( false )
|
initialized( false )
|
||||||
{
|
{
|
||||||
setObjectName( "feedbackwidget" );
|
setObjectName( "feedbackwidget" );
|
||||||
setAttribute( Qt::WA_NoSystemBackground );
|
setAttribute( Qt::WA_NoSystemBackground );
|
||||||
|
|
|
@ -63,7 +63,6 @@ private Q_SLOTS:
|
||||||
private:
|
private:
|
||||||
static KSMShutdownFeedback * s_pSelf;
|
static KSMShutdownFeedback * s_pSelf;
|
||||||
KSMShutdownFeedback();
|
KSMShutdownFeedback();
|
||||||
int m_currentY;
|
|
||||||
QPixmap m_pixmap;
|
QPixmap m_pixmap;
|
||||||
LogoutEffect *effect;
|
LogoutEffect *effect;
|
||||||
bool initialized;
|
bool initialized;
|
||||||
|
|
|
@ -79,10 +79,10 @@ struct QColorData {
|
||||||
#if 0
|
#if 0
|
||||||
typedef QIntDict<QColorData> QColorDict;
|
typedef QIntDict<QColorData> QColorDict;
|
||||||
typedef QIntDictIterator<QColorData> QColorDictIt;
|
typedef QIntDictIterator<QColorData> QColorDictIt;
|
||||||
#endif
|
|
||||||
static int current_alloc_context = 0; // current color alloc context
|
|
||||||
static const uint col_std_dict = 419;
|
static const uint col_std_dict = 419;
|
||||||
static const uint col_large_dict = 18397;
|
static const uint col_large_dict = 18397;
|
||||||
|
#endif
|
||||||
|
static int current_alloc_context = 0; // current color alloc context
|
||||||
|
|
||||||
class QColorScreenData {
|
class QColorScreenData {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -707,7 +707,7 @@ namespace Oxygen
|
||||||
void renderHeaderLines( const QRect&, const QPalette&, QPainter*, TileSet::Tiles ) const;
|
void renderHeaderLines( const QRect&, const QPalette&, QPainter*, TileSet::Tiles ) const;
|
||||||
|
|
||||||
void renderMenuItemRect( const QStyleOption* opt, const QRect& rect, const QPalette& pal, QPainter* p ) const
|
void renderMenuItemRect( const QStyleOption* opt, const QRect& rect, const QPalette& pal, QPainter* p ) const
|
||||||
{ renderMenuItemRect( opt, rect, pal.color(QPalette::Window), p ); }
|
{ renderMenuItemRect( opt, rect, pal.color(QPalette::Window), pal, p ); }
|
||||||
|
|
||||||
void renderMenuItemRect( const QStyleOption*, const QRect&, const QColor&, const QPalette&, QPainter* p ) const;
|
void renderMenuItemRect( const QStyleOption*, const QRect&, const QColor&, const QPalette&, QPainter* p ) const;
|
||||||
|
|
||||||
|
|
|
@ -214,7 +214,6 @@ void printCPUClock( const char* cmd )
|
||||||
{
|
{
|
||||||
int id;
|
int id;
|
||||||
float clock = 0;
|
float clock = 0;
|
||||||
cmd = cmd; /*Silence warning*/
|
|
||||||
|
|
||||||
if ( Dirty ) {
|
if ( Dirty ) {
|
||||||
processCpuInfo();
|
processCpuInfo();
|
||||||
|
@ -237,7 +236,6 @@ void printCPUxClockInfo( const char* cmd )
|
||||||
|
|
||||||
void printCPUClockInfo( const char* cmd )
|
void printCPUClockInfo( const char* cmd )
|
||||||
{
|
{
|
||||||
cmd = cmd; /*Silence warning*/
|
|
||||||
output( "CPU Clock Frequency\t0\t0\tMHz\n" );
|
output( "CPU Clock Frequency\t0\t0\tMHz\n" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,7 @@
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <QtGui/qx11info_x11.h>
|
#include <QtGui/qx11info_x11.h>
|
||||||
const int XFocusOut = FocusOut;
|
#include <fixx11h.h>
|
||||||
const int XFocusIn = FocusIn;
|
|
||||||
#undef FocusOut
|
|
||||||
#undef FocusIn
|
|
||||||
#undef KeyPress
|
|
||||||
#undef KeyRelease
|
|
||||||
|
|
||||||
|
|
||||||
int main( int argc, char *argv[] )
|
int main( int argc, char *argv[] )
|
||||||
|
|
|
@ -114,7 +114,6 @@ private:
|
||||||
static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
|
static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
|
||||||
static KAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
|
static KAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
|
||||||
static KAction *_copyPassAction;
|
static KAction *_copyPassAction;
|
||||||
QLabel*_details;
|
|
||||||
QString _currentFolder;
|
QString _currentFolder;
|
||||||
QMap<QString,QString> _currentMap; // save memory by storing
|
QMap<QString,QString> _currentMap; // save memory by storing
|
||||||
// only the most recent map.
|
// only the most recent map.
|
||||||
|
@ -124,8 +123,6 @@ private:
|
||||||
KMenu *_contextMenu;
|
KMenu *_contextMenu;
|
||||||
QTreeWidgetItem *_displayedItem; // used to find old item when selection just changed
|
QTreeWidgetItem *_displayedItem; // used to find old item when selection just changed
|
||||||
KActionCollection *_actionCollection;
|
KActionCollection *_actionCollection;
|
||||||
KMenu *_controlMenu;
|
|
||||||
KMenu *_walletSubmenu;
|
|
||||||
KTreeWidgetSearchLine *_searchLine;
|
KTreeWidgetSearchLine *_searchLine;
|
||||||
static QAction *_alwaysShowContentsAction, *_alwaysHideContentsAction;
|
static QAction *_alwaysShowContentsAction, *_alwaysHideContentsAction;
|
||||||
bool _alwaysShowContents;
|
bool _alwaysShowContents;
|
||||||
|
|
|
@ -39,7 +39,6 @@ namespace Oxygen
|
||||||
QList<ClientGroupItemData>(),
|
QList<ClientGroupItemData>(),
|
||||||
_client( *parent ),
|
_client( *parent ),
|
||||||
_dirty( false ),
|
_dirty( false ),
|
||||||
draggedItem_( NoItem ),
|
|
||||||
targetItem_( NoItem )
|
targetItem_( NoItem )
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -135,9 +135,6 @@ namespace Oxygen
|
||||||
/* used to trigger update at next paintEvent */
|
/* used to trigger update at next paintEvent */
|
||||||
bool _dirty;
|
bool _dirty;
|
||||||
|
|
||||||
//! dragged item
|
|
||||||
int draggedItem_;
|
|
||||||
|
|
||||||
//! target item
|
//! target item
|
||||||
int targetItem_;
|
int targetItem_;
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
|
|
||||||
class KDecorationBridge;
|
class KDecorationBridge;
|
||||||
class KDecorationFactory;
|
class KDecorationFactory;
|
||||||
|
class KCommonDecorationButton;
|
||||||
|
class KCommonDecorationWrapper;
|
||||||
|
|
||||||
enum ButtonType {
|
enum ButtonType {
|
||||||
HelpButton = 0,
|
HelpButton = 0,
|
||||||
|
@ -50,12 +52,6 @@ enum ButtonType {
|
||||||
ItemMenuButton // shows the window menu for one tab
|
ItemMenuButton // shows the window menu for one tab
|
||||||
};
|
};
|
||||||
|
|
||||||
class KCommonDecorationButton;
|
|
||||||
|
|
||||||
class KCommonDecorationButtonPrivate;
|
|
||||||
class KCommonDecorationPrivate;
|
|
||||||
class KCommonDecorationWrapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class eases development of decorations by implementing parts of KDecoration
|
* This class eases development of decorations by implementing parts of KDecoration
|
||||||
* which are error prone and common for most decorations.
|
* which are error prone and common for most decorations.
|
||||||
|
@ -436,8 +432,6 @@ private:
|
||||||
bool closing; // for menu doubleclick closing...
|
bool closing; // for menu doubleclick closing...
|
||||||
|
|
||||||
KCommonDecorationWrapper* wrapper;
|
KCommonDecorationWrapper* wrapper;
|
||||||
|
|
||||||
KCommonDecorationPrivate *d;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -519,8 +513,6 @@ private:
|
||||||
Qt::MouseButtons m_lastMouse;
|
Qt::MouseButtons m_lastMouse;
|
||||||
|
|
||||||
bool m_isLeft;
|
bool m_isLeft;
|
||||||
|
|
||||||
KCommonDecorationButtonPrivate *d;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
|
@ -71,7 +71,6 @@ IconView::IconView(QGraphicsWidget *parent)
|
||||||
m_numTextLines(2),
|
m_numTextLines(2),
|
||||||
m_layoutBroken(false),
|
m_layoutBroken(false),
|
||||||
m_needPostLayoutPass(false),
|
m_needPostLayoutPass(false),
|
||||||
m_positionsLoaded(false),
|
|
||||||
m_doubleClick(false),
|
m_doubleClick(false),
|
||||||
m_dragInProgress(false),
|
m_dragInProgress(false),
|
||||||
m_hoverDrag(false),
|
m_hoverDrag(false),
|
||||||
|
|
|
@ -252,7 +252,6 @@ private:
|
||||||
int m_numTextLines;
|
int m_numTextLines;
|
||||||
bool m_layoutBroken;
|
bool m_layoutBroken;
|
||||||
bool m_needPostLayoutPass;
|
bool m_needPostLayoutPass;
|
||||||
bool m_positionsLoaded;
|
|
||||||
bool m_doubleClick;
|
bool m_doubleClick;
|
||||||
bool m_dragInProgress;
|
bool m_dragInProgress;
|
||||||
bool m_hoverDrag;
|
bool m_hoverDrag;
|
||||||
|
|
|
@ -95,7 +95,6 @@ private:
|
||||||
QPersistentModelIndex m_pressedIndex;
|
QPersistentModelIndex m_pressedIndex;
|
||||||
bool m_dragInProgress;
|
bool m_dragInProgress;
|
||||||
bool m_wordWrap;
|
bool m_wordWrap;
|
||||||
bool m_drawShadows;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // LISTVIEW_H
|
#endif // LISTVIEW_H
|
||||||
|
|
|
@ -132,7 +132,6 @@ void ItemSpace::checkPreferredPositions()
|
||||||
ItemSpaceItem &item = group.m_groupItems[itemId];
|
ItemSpaceItem &item = group.m_groupItems[itemId];
|
||||||
|
|
||||||
qreal push;
|
qreal push;
|
||||||
PushPower power;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Push items back towards their perferred positions.
|
Push items back towards their perferred positions.
|
||||||
|
|
|
@ -650,7 +650,7 @@ void AppletsContainer::resizeEvent(QGraphicsSceneResizeEvent *event)
|
||||||
|
|
||||||
void AppletsContainer::syncBorders()
|
void AppletsContainer::syncBorders()
|
||||||
{
|
{
|
||||||
qreal left, top, right, bottom = 0;
|
qreal left, top, right, bottom = 0.0;
|
||||||
if (m_background->isValid()) {
|
if (m_background->isValid()) {
|
||||||
setFlag(QGraphicsItem::ItemHasNoContents, false);
|
setFlag(QGraphicsItem::ItemHasNoContents, false);
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,6 @@ private:
|
||||||
QGraphicsLinearLayout *m_externalLayout;
|
QGraphicsLinearLayout *m_externalLayout;
|
||||||
Qt::Orientation m_orientation;
|
Qt::Orientation m_orientation;
|
||||||
bool m_expandAll;
|
bool m_expandAll;
|
||||||
Plasma::FrameSvg *m_background;
|
|
||||||
AppletOverlay *m_appletOverlay;
|
AppletOverlay *m_appletOverlay;
|
||||||
QTimer *m_updateSizeTimer;
|
QTimer *m_updateSizeTimer;
|
||||||
QTimer *m_relayoutTimer;
|
QTimer *m_relayoutTimer;
|
||||||
|
|
|
@ -38,9 +38,7 @@
|
||||||
using namespace Plasma;
|
using namespace Plasma;
|
||||||
|
|
||||||
SaverDesktop::SaverDesktop(QObject *parent, const QVariantList &args)
|
SaverDesktop::SaverDesktop(QObject *parent, const QVariantList &args)
|
||||||
: Containment(parent, args),
|
: Containment(parent, args)
|
||||||
m_lockDesktopAction(0),
|
|
||||||
m_appletBrowserAction(0)
|
|
||||||
{
|
{
|
||||||
setContainmentType(CustomContainment);
|
setContainmentType(CustomContainment);
|
||||||
connect(this, SIGNAL(appletAdded(Plasma::Applet*,QPointF)), SLOT(newApplet(Plasma::Applet*,QPointF)));
|
connect(this, SIGNAL(appletAdded(Plasma::Applet*,QPointF)), SLOT(newApplet(Plasma::Applet*,QPointF)));
|
||||||
|
|
|
@ -44,10 +44,6 @@ public:
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void newApplet(Plasma::Applet *applet, const QPointF &pos);
|
void newApplet(Plasma::Applet *applet, const QPointF &pos);
|
||||||
|
|
||||||
private:
|
|
||||||
QAction *m_lockDesktopAction;
|
|
||||||
QAction *m_appletBrowserAction;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -176,7 +176,6 @@ private:
|
||||||
|
|
||||||
Plasma::DataEngine *m_timeEngine;
|
Plasma::DataEngine *m_timeEngine;
|
||||||
QDateTime m_dateFormat;
|
QDateTime m_dateFormat;
|
||||||
bool emitWhenSetup;
|
|
||||||
QStringList m_sourcesToReset;
|
QStringList m_sourcesToReset;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue