mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
KDE3_SUPPORT cleanup
This commit is contained in:
Ivailo Monev
parent
edf7f4dc98
commit
4f3fd401e4
10 changed files with 0 additions and 136 deletions
|
|
@ -26,9 +26,6 @@
|
|||
#ifndef QT_NO_CAST_TO_ASCII
|
||||
#define QT_NO_CAST_TO_ASCII
|
||||
#endif
|
||||
#ifndef KDE3_SUPPORT
|
||||
#define KDE3_SUPPORT
|
||||
#endif
|
||||
|
||||
#include "kdebug.h"
|
||||
#include <QThreadStorage>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@
|
|||
* Generated: Sat May 1 02:08:43 EST 1999
|
||||
*/
|
||||
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
#include "kglobal.h"
|
||||
#include "kglobal_p.h"
|
||||
#include <QThread>
|
||||
|
|
|
|||
|
|
@ -66,9 +66,6 @@ void KActionPrivate::setActiveGlobalShortcutNoEnable(const KShortcut &cut)
|
|||
|
||||
void KActionPrivate::slotTriggered()
|
||||
{
|
||||
#ifdef KDE3_SUPPORT
|
||||
emit q->activated();
|
||||
#endif
|
||||
emit q->triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
|
||||
|
||||
if (authAction) {
|
||||
|
|
|
|||
|
|
@ -502,14 +502,6 @@ public:
|
|||
|
||||
|
||||
Q_SIGNALS:
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* Emitted when this action is activated
|
||||
*
|
||||
* \deprecated use triggered(bool checked) instead.
|
||||
*/
|
||||
QT_MOC_COMPAT void activated();
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Emitted when the action is triggered. Also provides the state of the
|
||||
|
|
|
|||
|
|
@ -191,9 +191,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
#ifndef KDE3_SUPPORT
|
||||
KConfig *config() { return KGlobal::config().data(); }
|
||||
#endif
|
||||
|
||||
void _k_x11FilterDestroyed();
|
||||
void _k_checkAppStartedSlot();
|
||||
|
|
|
|||
|
|
@ -28,14 +28,6 @@
|
|||
|
||||
class KConfig;
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
#include <krandom.h>
|
||||
#include <kcmdlineargs.h>
|
||||
#include <kiconloader.h>
|
||||
#include <kicontheme.h>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QIcon>
|
||||
#endif
|
||||
|
||||
typedef unsigned long Atom;
|
||||
#if !defined(Q_WS_X11)
|
||||
|
|
@ -161,18 +153,6 @@ public:
|
|||
*/
|
||||
KConfig* sessionConfig();
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* Is the application restored from the session manager?
|
||||
*
|
||||
* @return If true, this application was restored by the session manager.
|
||||
* Note that this may mean the config object returned by
|
||||
* sessionConfig() contains data saved by a session closedown.
|
||||
* @see sessionConfig()
|
||||
* @deprecated use qApp->isSessionRestored()
|
||||
*/
|
||||
inline KDE_DEPRECATED bool isRestored() const { return QApplication::isSessionRestored(); }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Disables session management for this application.
|
||||
|
|
@ -214,27 +194,6 @@ public:
|
|||
*/
|
||||
bool sessionSaving() const;
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* Returns a QPixmap with the application icon.
|
||||
* @return the application icon
|
||||
* @deprecated Use QApplication::windowIcon()
|
||||
*/
|
||||
inline KDE_DEPRECATED QPixmap icon() const {
|
||||
int size = IconSize(KIconLoader::Desktop);
|
||||
return windowIcon().pixmap(size,size);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the mini-icon for the application as a QPixmap.
|
||||
* @return the application's mini icon
|
||||
* @deprecated Use QApplication::windowIcon()
|
||||
*/
|
||||
inline KDE_DEPRECATED QPixmap miniIcon() const {
|
||||
int size = IconSize(KIconLoader::Small);
|
||||
return windowIcon().pixmap(size,size);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Sets the top widget of the application.
|
||||
|
|
@ -271,16 +230,6 @@ public:
|
|||
*/
|
||||
static QString checkRecoverFile( const QString& pFilename, bool& bRecover );
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
#ifdef Q_WS_X11
|
||||
/**
|
||||
* Get the X11 display
|
||||
* @return the X11 Display
|
||||
* @deprecated use QX11Info::display()
|
||||
*/
|
||||
static inline KDE_DEPRECATED Display *getDisplay() { return QX11Info::display(); }
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Installs widget filter as global X11 event filter.
|
||||
|
|
@ -299,22 +248,6 @@ public:
|
|||
*/
|
||||
void removeX11EventFilter( const QWidget* filter );
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* Generates a uniform random number.
|
||||
* @return A truly unpredictable number in the range [0, RAND_MAX)
|
||||
* @deprecated Use KRandom::random()
|
||||
*/
|
||||
static inline KDE_DEPRECATED int random() { return KRandom::random(); }
|
||||
|
||||
/**
|
||||
* Generates a random string. It operates in the range [A-Za-z0-9]
|
||||
* @param length Generate a string of this length.
|
||||
* @return the random string
|
||||
* @deprecated use KRandom::randomString() instead.
|
||||
*/
|
||||
static inline KDE_DEPRECATED QString randomString(int length) { return KRandom::randomString(length); }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Returns the app startup notification identifier for this running
|
||||
|
|
@ -357,26 +290,6 @@ public:
|
|||
*/
|
||||
void updateRemoteUserTimestamp( const QString& service, int time = 0 );
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* Returns the argument to --geometry if any, so the geometry can be set
|
||||
* wherever necessary
|
||||
* @return the geometry argument, or QString() if there is none
|
||||
* @deprecated please use the following code instead:
|
||||
*
|
||||
* <code>
|
||||
* QString geometry;
|
||||
* KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kde");
|
||||
* if (args && args->isSet("geometry"))
|
||||
* geometry = args->getOption("geometry");
|
||||
*
|
||||
* </code>
|
||||
*/
|
||||
static inline KDE_DEPRECATED QString geometryArgument() {
|
||||
KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kde");
|
||||
return args->isSet("geometry") ? args->getOption("geometry") : QString();
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
@internal
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@
|
|||
|
||||
*/
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include "kcmodule.h"
|
||||
#undef KDE3_SUPPORT
|
||||
|
||||
#include <QtGui/QLayout>
|
||||
#include <QTimer>
|
||||
|
|
|
|||
|
|
@ -120,11 +120,6 @@ public:
|
|||
enum Button { NoAdditionalButton=0, Help=1, Default=2, Apply=4, Export=8 };
|
||||
Q_DECLARE_FLAGS( Buttons, Button )
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
KDE_CONSTRUCTOR_DEPRECATED KCModule( QWidget *parent, const char *name, const QStringList& args = QStringList() );
|
||||
|
||||
KDE_CONSTRUCTOR_DEPRECATED KCModule(const KComponentData &componentData, QWidget *parent, const QStringList& args);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Base class for all KControlModules.
|
||||
|
|
|
|||
|
|
@ -170,28 +170,6 @@ class KDEUI_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses
|
|||
*/
|
||||
QString tabText( int ) const; // but it's not virtual...
|
||||
|
||||
#ifdef KDE3_SUPPORT
|
||||
/**
|
||||
* @deprecated use tabText
|
||||
*/
|
||||
#ifndef KDE_NO_DEPRECATED
|
||||
inline KDE_DEPRECATED QString label( int index ) const { return tabText( index ); }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @deprecated use tabText
|
||||
*/
|
||||
#ifndef KDE_NO_DEPRECATED
|
||||
inline KDE_DEPRECATED QString tabLabel( QWidget *w ) const { return tabText( indexOf( w ) ); }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @deprecated use setTabText
|
||||
*/
|
||||
#ifndef KDE_NO_DEPRECATED
|
||||
inline KDE_DEPRECATED void setTabLabel( QWidget *w, const QString &l ) { setTabText( indexOf( w ),l ); }
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Reimplemented for internal reasons.
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@
|
|||
|
||||
*/
|
||||
|
||||
#define KDE3_SUPPORT
|
||||
#include "ksettings/pluginpage.h"
|
||||
#undef KDE3_SUPPORT
|
||||
#include "kpluginselector.h"
|
||||
#include <QtGui/QLayout>
|
||||
#include <kdialog.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue