TDE
/
tdeutils
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove use of TDE_VERSION

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 4 days ago
parent c6bdfd5494
commit 50855e76de
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
15 changed files with 5 additions and 145 deletions
Show Stats Download Patch File Download Diff File

1
kfloppy/main.cpp
Unescape Escape View File

@ -22,7 +22,6 @@
*/
#include <tdeversion.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>

1
kgpg/kgpg.cpp
Unescape Escape View File

@ -32,7 +32,6 @@
#include <tqhbuttongroup.h>
#include <tdeglobal.h>
#include <kactivelabel.h>
#include <tdeversion.h>
#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>

1
kgpg/kgpgoptions.cpp
Unescape Escape View File

@ -24,7 +24,6 @@
#include <tqtoolbutton.h>
#include <tqfile.h>
#include <tdeconfig.h>
#include <tdeversion.h>
#include <tdelocale.h>
#include <tdeprocio.h>
#include <tqcheckbox.h>

1
kgpg/popuppublic.cpp
Unescape Escape View File

@ -32,7 +32,6 @@
#include <tqtoolbutton.h>
#include <tqtextcodec.h>
#include <tdeversion.h>
#include <tdelistview.h>
#include <tdeprocess.h>
#include <tdeprocio.h>

1
kmilo/kmilod/defaultskin.cpp
Unescape Escape View File

@ -31,7 +31,6 @@
#include <twin.h>
#include <netwm.h>
#include <tdeglobalsettings.h>
#include <tdeversion.h>
#include <tdeconfig.h>
#include "defaultskin.h"

8
superkaramba/src/imagelabel.cpp
Unescape Escape View File

@ -445,11 +445,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
if ( fileOnNet )
{
TQString tmpFile;
#if defined(KDE_3_2)
if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else
if(TDEIO::NetAccess::download(KURL(path), tmpFile))
#endif
{
pixmap_off = KPixmap(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
@ -493,11 +489,7 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
if ( fileOnNet )
{
TQString tmpFile;
#if defined(KDE_3_2)
if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else
if(TDEIO::NetAccess::download(KURL(path), tmpFile))
#endif
{
pixmap_on = KPixmap(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);

23
superkaramba/src/karamba.cpp
Unescape Escape View File

@ -36,7 +36,6 @@
#include <krun.h>
#include <tdelocale.h>
#include <twin.h>
#include <tdeversion.h>
#include <kdirwatch.h>
#include <tdeparts/componentfactory.h>
@ -762,12 +761,7 @@ bool karamba::parseConfig()
// Matthew Kay: set window type to "dock"
// (plays better with taskbar themes this way)
KWin::setType(winId(), NET::Dock);
#if defined(TDE_MAKE_VERSION)
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
//KDE 3.2 addition for the always on top issues
KWin::setState(winId(), NET::KeepBelow);
#endif
#endif
KWin::setState(winId(), NET::KeepBelow);
}
m_theme.close();
@ -804,13 +798,7 @@ void karamba::start()
void karamba::makeActive()
{
KWin::setType(winId(), NET::Normal);
#if defined(TDE_MAKE_VERSION)
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
//KDE 3.2 addition for the always on top issues
KWin::setState(winId(), NET::Modal);
#endif
#endif
KWin::setState(winId(), NET::Modal);
}
void karamba::makePassive()
@ -828,12 +816,7 @@ void karamba::makePassive()
// Matthew Kay: set window type to "dock" (plays better with taskbar themes
// this way)
KWin::setType(winId(), NET::Dock);
#if defined(TDE_MAKE_VERSION)
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
//KDE 3.2 addition for the always on top issues
KWin::setState(winId(), NET::KeepBelow);
#endif
#endif
KWin::setState(winId(), NET::KeepBelow);
}
void karamba::popupNotify(int)

12
superkaramba/src/karambaapp.h
Unescape Escape View File

@ -12,20 +12,8 @@
#define KARAMBAAPP_H
#include "tdeapplication.h"
#include <tdeversion.h>
#include <ksystemtray.h>
#undef KDE_3_2
#undef KDE_3_3
#if defined(TDE_MAKE_VERSION)
#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
#define KDE_3_2
#endif
#if TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
#define KDE_3_3
#endif
#endif
#define karambaApp ((KarambaApplication*)tqApp)
class karamba;

1
superkaramba/src/main.cpp
Unescape Escape View File

@ -32,7 +32,6 @@
#include <tqstringlist.h>
#include <tdeconfig.h>
#include <tdestandarddirs.h>
#include <tdeversion.h>
#include "karamba.h"
#include "karambasessionmanaged.h"

4
superkaramba/src/rsssensor.cpp
Unescape Escape View File

@ -47,11 +47,7 @@ void RssSensor::update()
TQString tmpFile;
bool OK = false;
#if defined(KDE_3_3)
if(TDEIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow()))
#else
if(TDEIO::NetAccess::download(KURL(source), tmpFile))
#endif
{
file.setName(tmpFile);
if ( file.open(IO_ReadOnly | IO_Translate) )

12
superkaramba/src/showdesktop.cpp
Unescape Escape View File

@ -51,12 +51,6 @@ void ShowDesktop::slotCurrentDesktopChanged(int)
showDesktop( false );
}
#ifdef KDE_3_3
#define NET_ALL_TYPES_MASK (NET::AllTypesMask)
#else
#define NET_ALL_TYPES_MASK (-1LU)
#endif
void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
{
if (!showingDesktop)
@ -67,11 +61,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
{
NETWinInfo inf(tqt_xdisplay(), w, tqt_xrootwin(),
NET::XAWMState | NET::WMWindowType);
#ifdef KDE_3_2
NET::WindowType windowType = inf.windowType(NET_ALL_TYPES_MASK);
#else
NET::WindowType windowType = inf.windowType();
#endif
NET::WindowType windowType = inf.windowType(NET::AllTypesMask);
if ((windowType == NET::Normal || windowType == NET::Unknown)
&& inf.mappingState() == NET::Visible )
{

68
superkaramba/src/taskmanager.cpp
Unescape Escape View File

@ -106,21 +106,11 @@ Task* TaskManager::findTask(WId w)
return 0;
}
#ifdef KDE_3_3
#define NET_ALL_TYPES_MASK (NET::AllTypesMask)
#else
#define NET_ALL_TYPES_MASK (-1LU)
#endif
void TaskManager::windowAdded(WId w )
{
NETWinInfo info(tqt_xdisplay(), w, tqt_xrootwin(),
NET::WMWindowType | NET::WMPid | NET::WMState );
#ifdef KDE_3_2
NET::WindowType windowType = info.windowType(NET_ALL_TYPES_MASK);
#else
NET::WindowType windowType = info.windowType();
#endif
NET::WindowType windowType = info.windowType(NET::AllTypesMask);
// ignore NET::Tool and other special window types
if (windowType != NET::Normal && windowType != NET::Override
&& windowType != NET::Unknown && windowType != NET::Dialog)
@ -334,11 +324,7 @@ Task::Task(WId win, TaskManager * parent, const char *name) :
_lastWidth(0), _lastHeight(0), _lastResize(false), _lastIcon(),
_thumbSize(0.2), _thumb(), _grab()
{
#ifdef KDE_3_2
_info = KWin::windowInfo(_win, 0, 0);
#else
_info = KWin::info(_win);
#endif
// try to load icon via net_wm
_pixmap = KWin::icon(_win, 16, 16, true);
@ -359,11 +345,7 @@ Task::~Task()
void Task::refresh(bool icon)
{
#ifdef KDE_3_2
_info = KWin::windowInfo(_win, 0, 0);
#else
_info = KWin::info(_win);
#endif
if (icon)
{
// try to load icon via net_wm
@ -398,56 +380,32 @@ void Task::setActive(bool a)
bool Task::isMaximized() const
{
#ifdef KDE_3_2
return(_info.state() & NET::Max);
#else
return(_info.state & NET::Max);
#endif
}
bool Task::isIconified() const
{
#ifdef KDE_3_2
return (_info.mappingState() == NET::Iconic);
#else
return (_info.mappingState == NET::Iconic);
#endif
}
bool Task::isAlwaysOnTop() const
{
#ifdef KDE_3_2
return (_info.state() & NET::StaysOnTop);
#else
return (_info.state & NET::StaysOnTop);
#endif
}
bool Task::isShaded() const
{
#ifdef KDE_3_2
return (_info.state() & NET::Shaded);
#else
return (_info.state & NET::Shaded);
#endif
}
bool Task::isOnCurrentDesktop() const
{
#ifdef KDE_3_2
return (_info.onAllDesktops() || _info.desktop() == twin_module->currentDesktop());
#else
return (_info.onAllDesktops || _info.desktop == twin_module->currentDesktop());
#endif
}
bool Task::isOnAllDesktops() const
{
#ifdef KDE_3_2
return _info.onAllDesktops();
#else
return _info.onAllDesktops;
#endif
}
bool Task::isActive() const
@ -463,11 +421,7 @@ bool Task::isOnTop() const
bool Task::isModified() const
{
static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]");
#ifdef KDE_3_2
int modStrPos = _info.visibleName().find(modStr);
#else
int modStrPos = _info.visibleName.find(modStr);
#endif
return ( modStrPos != -1 );
}
@ -623,11 +577,7 @@ void Task::maximize()
NETWinInfo ni( tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
ni.setState( NET::Max, NET::Max );
#ifdef KDE_3_2
if (_info.mappingState() == NET::Iconic)
#else
if (_info.mappingState == NET::Iconic)
#endif
activate();
}
@ -635,11 +585,7 @@ void Task::restore()
{
NETWinInfo ni( tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
ni.setState( 0, NET::Max );
#ifdef KDE_3_2
if (_info.mappingState() == NET::Iconic)
#else
if (_info.mappingState == NET::Iconic)
#endif
activate();
}
@ -689,30 +635,18 @@ void Task::toDesktop(int desk)
NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMDesktop);
if (desk == 0)
{
#ifdef KDE_3_2
if (_info.onAllDesktops())
{
ni.setDesktop(twin_module->currentDesktop());
KWin::forceActiveWindow(_win);
}
#else
if (_info.onAllDesktops)
{
ni.setDesktop(twin_module->currentDesktop());
KWin::setActiveWindow(_win);
}
#endif
else
ni.setDesktop(NETWinInfo::OnAllDesktops);
return;
}
ni.setDesktop(desk);
if (desk == twin_module->currentDesktop())
#ifdef KDE_3_2
KWin::forceActiveWindow(_win);
#else
KWin::setActiveWindow(_win);
#endif
}
void Task::toCurrentDesktop()

13
superkaramba/src/taskmanager.h
Unescape Escape View File

@ -76,21 +76,12 @@ public:
TaskManager* taskManager() const { return (TaskManager*) parent(); }
WId window() const { return _win; }
#ifdef KDE_3_2
TQString name() const { return _info.name(); }
TQString visibleName() const { return _info.visibleName(); }
/**
* Returns the desktop on which this task's window resides.
*/
int desktop() const { return _info.desktop(); }
#else
TQString name() const { return _info.name; }
TQString visibleName() const { return _info.visibleName; }
/**
* Returns the desktop on which this task's window resides.
*/
int desktop() const { return _info.desktop; }
#endif
TQString visibleNameWithState() const { return _info.visibleNameWithState(); }
TQString iconName() const;
TQString visibleIconName() const;
@ -349,11 +340,7 @@ private:
bool _active;
WId _win;
TQPixmap _pixmap;
#ifdef KDE_3_2
KWin::WindowInfo _info;
#else
KWin::Info _info;
#endif
TQValueList<WId> _transients;
int _lastWidth;

1
tdefilereplace/knewprojectdlg.cpp
Unescape Escape View File

@ -39,7 +39,6 @@
#include <tdelocale.h>
#include <kpushbutton.h>
#include <tdestandarddirs.h>
#include <tdeversion.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <tdeapplication.h>

3
tdelirc/irkick/irkick.cpp
Unescape Escape View File

@ -14,12 +14,9 @@
#include <tqtimer.h>
#include <tqevent.h>
#include <tdeversion.h>
#include <tdeapplication.h>
#include <tdeaction.h>
#if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5)
#include <tdeactioncollection.h>
#endif
#include <tdesimpleconfig.h>
#include <ksystemtray.h>
#include <kiconloader.h>

Write Preview
Loading…
Cancel
Save