summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2021-03-30 14:12:55 +0300
committerMavridis Philippe <mavridisf@gmail.com>2021-03-30 14:12:55 +0300
commit29129afdb289a6e17146cc69867c95e0758cf4aa (patch)
treed90be4b9eacb21907508e0f2cfc7c51fddea5671 /src
parentd991b7f387775dc1071fb0c0af78de1c613ca991 (diff)
downloadkompose-29129afdb289a6e17146cc69867c95e0758cf4aa.tar.gz
kompose-29129afdb289a6e17146cc69867c95e0758cf4aa.zip
KDE3->TDE conversion
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in24
-rw-r--r--src/kompose.cpp6
-rw-r--r--src/kompose.desktop4
-rw-r--r--src/komposedesktopwidget.cpp10
-rw-r--r--src/komposefullscreenwidget.cpp14
-rw-r--r--src/komposefullscreenwidget.h4
-rw-r--r--src/komposeglobal.cpp40
-rw-r--r--src/komposeglobal.h44
-rw-r--r--src/komposelayout.cpp2
-rw-r--r--src/komposepreferences.cpp16
-rw-r--r--src/komposepreferences.cpp.orig16
-rw-r--r--src/komposepreferences.h2
-rw-r--r--src/komposesettings.cpp8
-rw-r--r--src/komposesettings.h6
-rw-r--r--src/komposesystray.cpp12
-rw-r--r--src/komposesystray.h8
-rw-r--r--src/komposetask.cpp12
-rw-r--r--src/komposetask.h6
-rw-r--r--src/komposetaskmanager.cpp40
-rw-r--r--src/komposetaskmanager.h2
-rw-r--r--src/komposetaskprefswidget.cpp14
-rw-r--r--src/komposetaskvisualizer.cpp2
-rw-r--r--src/komposetaskwidget.cpp22
-rw-r--r--src/komposetaskwidget.h18
-rw-r--r--src/komposeviewmanager.cpp4
-rw-r--r--src/main.cpp20
27 files changed, 179 insertions, 179 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 77d2354..b9dc0ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ kompose_SOURCES = main.cpp kompose.cpp komposetaskmanager.cpp komposetask.cpp \
komposetaskvisualizer.cpp komposeviewmanager.cpp komposedcopiface.skel
#kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs`
kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs`
-kompose_LDADD = $(LIB_KDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
+kompose_LDADD = $(LIB_TDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/src/Makefile.in b/src/Makefile.in
index 5e620fc..0095e67 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -174,18 +174,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@
LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@
@@ -294,7 +294,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
@@ -344,7 +344,7 @@ kompose_SOURCES = main.cpp kompose.cpp komposetaskmanager.cpp komposetask.cpp \
#kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs`
kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs`
-kompose_LDADD = $(LIB_KDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
+kompose_LDADD = $(LIB_TDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/src/kompose.cpp b/src/kompose.cpp
index 60cec12..ddbdafa 100644
--- a/src/kompose.cpp
+++ b/src/kompose.cpp
@@ -24,7 +24,7 @@
#include "komposesettings.h"
#include "komposetaskmanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuniqueapplication.h>
#include <X11/Xlib.h>
@@ -80,8 +80,8 @@ bool Kompose::x11EventFilter (XEvent *event)
#endif
// This costed me nerves:
- // Call this or kwinmodule won't work
- return KApplication::x11EventFilter(event);
+ // Call this or twinmodule won't work
+ return TDEApplication::x11EventFilter(event);
}
diff --git a/src/kompose.desktop b/src/kompose.desktop
index 6ee7710..009d8a9 100644
--- a/src/kompose.desktop
+++ b/src/kompose.desktop
@@ -15,5 +15,5 @@ Terminal=false
TerminalOptions=
Type=Application
X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+X-TDE-SubstituteUID=false
+X-TDE-Username=
diff --git a/src/komposedesktopwidget.cpp b/src/komposedesktopwidget.cpp
index f010f6d..84ab82d 100644
--- a/src/komposedesktopwidget.cpp
+++ b/src/komposedesktopwidget.cpp
@@ -33,11 +33,11 @@
#include <tqdragobject.h>
#include <tqtooltip.h>
-#include <klocale.h>
-#include <kwin.h>
+#include <tdelocale.h>
+#include <twin.h>
#include <ksharedpixmap.h>
#include <krootpixmap.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <kcursor.h>
#include <kdebug.h>
@@ -55,8 +55,8 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos
// Set Desktop background as our background
setBackgroundMode( TQt::NoBackground );
- KWinModule kwinmodule( this, 1 );
- deskName = kwinmodule.desktopName(desktop+1);
+ KWinModule twinmodule( this, 1 );
+ deskName = twinmodule.desktopName(desktop+1);
TQToolTip::add( this, i18n("Desktop %1 - %2").arg(desktop).arg(deskName) );
diff --git a/src/komposefullscreenwidget.cpp b/src/komposefullscreenwidget.cpp
index 07229a7..ab1aa44 100644
--- a/src/komposefullscreenwidget.cpp
+++ b/src/komposefullscreenwidget.cpp
@@ -23,13 +23,13 @@
#include <tqpainter.h>
#include <tqdesktopwidget.h>
-#include <kwin.h>
-#include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <twin.h>
+#include <tdeapplication.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
#include <ksharedpixmap.h>
#include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <krootpixmap.h>
@@ -59,7 +59,7 @@ KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout
kdDebug() << KomposeSettings::instance()->getViewScreen() << endl;
if (KomposeSettings::instance()->getViewScreen() == -1)
- setGeometry( KGlobalSettings::desktopGeometry( this ) );
+ setGeometry( TDEGlobalSettings::desktopGeometry( this ) );
else
{
TQDesktopWidget deskwidget;
@@ -83,7 +83,7 @@ KomposeFullscreenWidget::~KomposeFullscreenWidget()
void KomposeFullscreenWidget::initMenu()
{
- menu = new KPopupMenu();
+ menu = new TDEPopupMenu();
KomposeGlobal::instance()->getActShowWorldView()->plug(menu);
KomposeGlobal::instance()->getActShowVirtualDesktopView()->plug(menu);
diff --git a/src/komposefullscreenwidget.h b/src/komposefullscreenwidget.h
index f509b81..7b1af6e 100644
--- a/src/komposefullscreenwidget.h
+++ b/src/komposefullscreenwidget.h
@@ -19,7 +19,7 @@
class KRootPixmap;
class KomposeDesktopWidget;
-class KPopupMenu;
+class TDEPopupMenu;
/**
@author Hans Oischinger
@@ -54,7 +54,7 @@ protected:
private:
int type;
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
KRootPixmap *rootpix;
};
diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp
index f2a1a35..7d7dbe3 100644
--- a/src/komposeglobal.cpp
+++ b/src/komposeglobal.cpp
@@ -19,17 +19,17 @@
#include <tqtimer.h>
-#include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <kkeydialog.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
#include <ksharedpixmap.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
#include <kdebug.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -78,10 +78,10 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name)
damageEvent(0)
{
globalInstance = this;
- kwin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :(
- currentDesktop = kwin_module->currentDesktop();
+ twin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :(
+ currentDesktop = twin_module->currentDesktop();
- desktopBgPixmap = new KSharedPixmap;
+ desktopBgPixmap = new TDESharedPixmap;
connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool)));
initSharedPixmaps();
initCompositeExt();
@@ -151,19 +151,19 @@ void KomposeGlobal::initGui()
*/
void KomposeGlobal::initActions()
{
- actionCollection = new KActionCollection( (TQWidget*)0 );
+ actionCollection = new TDEActionCollection( (TQWidget*)0 );
// Actions
actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection );
- actShowWorldView = new KAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
+ actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
0,
KomposeViewManager::instance(), SLOT(createWorldView()),
actionCollection, "showWorldView");
- actShowVirtualDesktopView = new KAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
+ actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
0,
KomposeViewManager::instance(), SLOT(createVirtualDesktopView()),
actionCollection, "showVirtualDesktopView");
- actShowCurrentDesktopView = new KAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
+ actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
0,
KomposeViewManager::instance(), SLOT(createCurrentDesktopView()),
actionCollection, "showCurrentDesktopView");
@@ -173,7 +173,7 @@ void KomposeGlobal::initActions()
actConfigGlobalShortcuts = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()),
actionCollection, "options_configure_global_keybinding");
actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts..."));
- actAboutDlg = new KAction(i18n("About Komposé"), "kompose",
+ actAboutDlg = new TDEAction(i18n("About Komposé"), "kompose",
0,
this, SLOT(showAboutDlg()),
actionCollection, "showAboutDlg");
@@ -182,8 +182,8 @@ void KomposeGlobal::initActions()
void KomposeGlobal::initSharedPixmaps()
{
// Whenever the background pixmap changes we'll have to reload it:
- //connect(kwin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
- connect(kwin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
+ //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
+ connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)));
enablePixmapExports();
@@ -215,7 +215,7 @@ void KomposeGlobal::slotDesktopChanged(int desktop)
return;
}
- currentDesktop = kwin_module->currentDesktop();
+ currentDesktop = twin_module->currentDesktop();
refreshSharedPixmaps();
}
@@ -285,7 +285,7 @@ void KomposeGlobal::showGlobalShortcutsSettingsDialog()
void KomposeGlobal::showAboutDlg()
{
aboutDialogOpen = true;
- KAboutApplication* kabout = new KAboutApplication();
+ TDEAboutApplication* kabout = new TDEAboutApplication();
kabout->exec();
delete kabout;
aboutDialogOpen = false;
diff --git a/src/komposeglobal.h b/src/komposeglobal.h
index 9e56ae0..760fce9 100644
--- a/src/komposeglobal.h
+++ b/src/komposeglobal.h
@@ -17,10 +17,10 @@ class KomposeSysTray;
#include <tqobject.h>
#include <tqstring.h>
-class KPopupMenu;
-class KActionCollection;
-class KAction;
-class KSharedPixmap;
+class TDEPopupMenu;
+class TDEActionCollection;
+class TDEAction;
+class TDESharedPixmap;
class KWinModule;
#ifdef HAVE_CONFIG_H
@@ -55,15 +55,15 @@ public:
int getDamageEvent() { return damageEvent; }
// Action getters
- KAction *getActConfigGlobalShortcuts() { return actConfigGlobalShortcuts; }
- KAction *getActPreferencesDialog() { return actPreferencesDialog; }
- KAction *getActShowVirtualDesktopView() { return actShowVirtualDesktopView; }
- KAction *getActShowCurrentDesktopView() { return actShowCurrentDesktopView; }
- KAction *getActShowWorldView() { return actShowWorldView; }
- KAction *getActAboutDlg() { return actAboutDlg; }
- KAction *getActQuit() { return actQuit; }
+ TDEAction *getActConfigGlobalShortcuts() { return actConfigGlobalShortcuts; }
+ TDEAction *getActPreferencesDialog() { return actPreferencesDialog; }
+ TDEAction *getActShowVirtualDesktopView() { return actShowVirtualDesktopView; }
+ TDEAction *getActShowCurrentDesktopView() { return actShowCurrentDesktopView; }
+ TDEAction *getActShowWorldView() { return actShowWorldView; }
+ TDEAction *getActAboutDlg() { return actAboutDlg; }
+ TDEAction *getActQuit() { return actQuit; }
- const KSharedPixmap *getDesktopBgPixmap() const { return desktopBgPixmap; }
+ const TDESharedPixmap *getDesktopBgPixmap() const { return desktopBgPixmap; }
protected:
void initActions();
@@ -90,20 +90,20 @@ private:
bool xcomposite;
int damageEvent, damageError;
- KSharedPixmap *desktopBgPixmap;
+ TDESharedPixmap *desktopBgPixmap;
int currentDesktop;
KomposeSysTray* systray;
- KActionCollection* actionCollection;
+ TDEActionCollection* actionCollection;
- KAction *actConfigGlobalShortcuts;
- KAction *actPreferencesDialog;
- KAction *actShowVirtualDesktopView;
- KAction *actShowCurrentDesktopView;
- KAction *actShowWorldView;
- KAction *actAboutDlg;
- KAction *actQuit;
+ TDEAction *actConfigGlobalShortcuts;
+ TDEAction *actPreferencesDialog;
+ TDEAction *actShowVirtualDesktopView;
+ TDEAction *actShowCurrentDesktopView;
+ TDEAction *actShowWorldView;
+ TDEAction *actAboutDlg;
+ TDEAction *actQuit;
- KWinModule* kwin_module;
+ KWinModule* twin_module;
};
#endif
diff --git a/src/komposelayout.cpp b/src/komposelayout.cpp
index 178ec2b..c34a382 100644
--- a/src/komposelayout.cpp
+++ b/src/komposelayout.cpp
@@ -26,7 +26,7 @@
#include <math.h>
-#include <kwin.h>
+#include <twin.h>
#include <kdebug.h>
diff --git a/src/komposepreferences.cpp b/src/komposepreferences.cpp
index 91c4d7a..572b714 100644
--- a/src/komposepreferences.cpp
+++ b/src/komposepreferences.cpp
@@ -17,7 +17,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqspinbox.h>
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <kcolorbutton.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
KomposePreferences::KomposePreferences()
: KDialogBase(IconList, i18n("Komposé Preferences"), Ok|Apply|Cancel, Ok)
@@ -41,9 +41,9 @@ KomposePreferences::KomposePreferences()
// How about TQt Designer?!
m_hasXinerama = TQDesktopWidget().numScreens() > 1;
- TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) );
- TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) );
- TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) );
+ TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", TDEIcon::SizeMedium) );
+ TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", TDEIcon::SizeMedium) );
+ TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", TDEIcon::SizeMedium) );
TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() );
@@ -266,13 +266,13 @@ void KomposePreferences::updateIconSliderDesc( int val )
void KomposePreferences::showWindowTitleFontDialog()
{
- KFontDialog::getFont( *windowTitleFont );
- // if ( result == KFontDialog::Accepted )
+ TDEFontDialog::getFont( *windowTitleFont );
+ // if ( result == TDEFontDialog::Accepted )
}
void KomposePreferences::showDesktopTitleFontDialog()
{
- KFontDialog::getFont( *desktopTitleFont );
+ TDEFontDialog::getFont( *desktopTitleFont );
}
void KomposePreferences::fillPages()
diff --git a/src/komposepreferences.cpp.orig b/src/komposepreferences.cpp.orig
index 9bb8460..2406958 100644
--- a/src/komposepreferences.cpp.orig
+++ b/src/komposepreferences.cpp.orig
@@ -16,7 +16,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqspinbox.h>
@@ -31,14 +31,14 @@
#include <kiconloader.h>
#include <kcolorbutton.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
KomposePreferences::KomposePreferences()
: KDialogBase(IconList, i18n(TQString::fromUtf8("Komposé Preferences").utf8()), Ok|Apply|Cancel, Ok)
{
- TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) );
- TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) );
- TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) );
+ TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", TDEIcon::SizeMedium) );
+ TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", TDEIcon::SizeMedium) );
+ TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", TDEIcon::SizeMedium) );
TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() );
@@ -195,13 +195,13 @@ void KomposePreferences::updateIconSliderDesc( int val )
void KomposePreferences::showWindowTitleFontDialog()
{
- KFontDialog::getFont( *windowTitleFont );
- // if ( result == KFontDialog::Accepted )
+ TDEFontDialog::getFont( *windowTitleFont );
+ // if ( result == TDEFontDialog::Accepted )
}
void KomposePreferences::showDesktopTitleFontDialog()
{
- KFontDialog::getFont( *desktopTitleFont );
+ TDEFontDialog::getFont( *desktopTitleFont );
}
void KomposePreferences::fillPages()
diff --git a/src/komposepreferences.h b/src/komposepreferences.h
index 3bde6a8..47f2027 100644
--- a/src/komposepreferences.h
+++ b/src/komposepreferences.h
@@ -14,7 +14,7 @@
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
class TQCheckBox;
class TQFrame;
diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp
index a221450..a4941ce 100644
--- a/src/komposesettings.cpp
+++ b/src/komposesettings.cpp
@@ -18,9 +18,9 @@
#include <tqcolor.h>
#include <kglobalaccel.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
@@ -48,7 +48,7 @@ KomposeSettings::KomposeSettings(TQObject *parent, const char *name)
{
// Init global shortcut object
- globalAccel = new KGlobalAccel( this );
+ globalAccel = new TDEGlobalAccel( this );
globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"),
i18n("Displays the view you have configured as default"),
KKey::TQtWIN+Key_Tab, KKey::TQtWIN+CTRL+SHIFT+Key_Tab,
diff --git a/src/komposesettings.h b/src/komposesettings.h
index c6da44a..7d2efa5 100644
--- a/src/komposesettings.h
+++ b/src/komposesettings.h
@@ -20,7 +20,7 @@
enum KomposeDisplay { KOMPOSEDISPLAY_WORLD, KOMPOSEDISPLAY_VIRTUALDESKS, KOMPOSEDISPLAY_CURRENTDESK };
-class KGlobalAccel;
+class TDEGlobalAccel;
class TQFontMetrics;
@@ -41,7 +41,7 @@ public:
void writeConfig();
bool hasDialogOpen() { return dialogOpen; }
- KGlobalAccel *getGlobalAccel() const { return globalAccel; }
+ TDEGlobalAccel *getGlobalAccel() const { return globalAccel; }
bool getUseComposite() const { return useComposite; }
void setUseComposite( bool b ) { useComposite = b; }
@@ -125,7 +125,7 @@ signals:
void settingsChanged();
private:
- KGlobalAccel *globalAccel;
+ TDEGlobalAccel *globalAccel;
bool dialogOpen;
bool useComposite;
diff --git a/src/komposesystray.cpp b/src/komposesystray.cpp
index 7b06a42..2747bd6 100644
--- a/src/komposesystray.cpp
+++ b/src/komposesystray.cpp
@@ -21,11 +21,11 @@
#include <tqbitmap.h>
#include <tqpainter.h>
-#include <kapplication.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeapplication.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
#include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name)
: KSystemTray(parent, name)
@@ -97,7 +97,7 @@ void KomposeSysTray::currentDesktopChanged(int desktop)
int oldH = pixmap()->size().height();
TQString uStr=TQString::number( desktop );
- TQFont f=KGlobalSettings::generalFont();
+ TQFont f=TDEGlobalSettings::generalFont();
f.setBold(true);
f.setItalic(true);
float pointSize=f.pointSizeFloat();
@@ -118,7 +118,7 @@ void KomposeSysTray::currentDesktopChanged(int desktop)
TQImage img=pix.convertToImage();
// overlay
TQImage overlayImg=icon.copy();
- KIconEffect::overlay(overlayImg, img);
+ TDEIconEffect::overlay(overlayImg, img);
TQPixmap newIcon;
newIcon.convertFromImage(overlayImg);
setPixmap(newIcon);
diff --git a/src/komposesystray.h b/src/komposesystray.h
index 0fa6923..e5d34e3 100644
--- a/src/komposesystray.h
+++ b/src/komposesystray.h
@@ -16,9 +16,9 @@
#include <tqimage.h>
-class KAction;
-class KGlobalAccel;
-class KPopupMenu;
+class TDEAction;
+class TDEGlobalAccel;
+class TDEPopupMenu;
/**
@author Hans Oischinger
@@ -40,7 +40,7 @@ protected slots:
void slotConfigChanged();
private:
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
TQImage icon;
};
diff --git a/src/komposetask.cpp b/src/komposetask.cpp
index 0d34c13..bf70b02 100644
--- a/src/komposetask.cpp
+++ b/src/komposetask.cpp
@@ -30,8 +30,8 @@
#include <tqpixmap.h>
#include <kpixmapio.h>
-#include <kwinmodule.h>
-#include <klocale.h>
+#include <twinmodule.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <netwm.h>
@@ -41,9 +41,9 @@
#include "komposetaskvisualizer.h"
#include <X11/Xlib.h>
-KomposeTask::KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent, const char *name)
+KomposeTask::KomposeTask(WId win, KWinModule *twinmod, TQObject *parent, const char *name)
: TQObject(parent, name),
- kwinmodule(kwinmod),
+ twinmodule(twinmod),
windowID(win),
blockDamageEvents(false)
{
@@ -105,7 +105,7 @@ bool KomposeTask::isOnTop() const
bool KomposeTask::isActive() const
{
- if ( kwinmodule->activeWindow() == windowID )
+ if ( twinmodule->activeWindow() == windowID )
return true;
else
return false;
@@ -244,7 +244,7 @@ void KomposeTask::toDesktop(int desk)
void KomposeTask::toCurrentDesktop()
{
- toDesktop(kwinmodule->currentDesktop());
+ toDesktop(twinmodule->currentDesktop());
}
void KomposeTask::setAlwaysOnTop(bool stay)
diff --git a/src/komposetask.h b/src/komposetask.h
index a85d1a5..cd30d9c 100644
--- a/src/komposetask.h
+++ b/src/komposetask.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqrect.h>
-#include <kwin.h>
+#include <twin.h>
class KWinModule;
class KomposeTaskVisualizer;
@@ -34,7 +34,7 @@ class KomposeTask : public TQObject
{
Q_OBJECT
public:
- KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent = 0, const char *name = 0);
+ KomposeTask(WId win, KWinModule *twinmod, TQObject *parent = 0, const char *name = 0);
~KomposeTask();
@@ -106,7 +106,7 @@ protected slots:
void unBlockDamageEvents() { blockDamageEvents = false; }
private:
- KWinModule* kwinmodule;
+ KWinModule* twinmodule;
WId windowID;
WId wmframeID;
KWin::WindowInfo windowInfo;
diff --git a/src/komposetaskmanager.cpp b/src/komposetaskmanager.cpp
index 93e79aa..bf8971e 100644
--- a/src/komposetaskmanager.cpp
+++ b/src/komposetaskmanager.cpp
@@ -32,11 +32,11 @@
#include <tqpixmap.h>
#include <tqwidget.h>
-#include <kapplication.h>
-#include <kwinmodule.h>
+#include <tdeapplication.h>
+#include <twinmodule.h>
#include <netwm.h>
-#include <kwin.h>
-#include <kapplication.h>
+#include <twin.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#ifdef COMPOSITE
@@ -69,32 +69,32 @@ KomposeTaskManager::KomposeTaskManager()
: TQObject()
{
taskManagerInstance = this;
- kwin_module = new KWinModule();
+ twin_module = new KWinModule();
numDesks = KWin::numberOfDesktops();
callCompositeRedirect();
// Listeners for KWinmodule signals
- connect( kwin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
- connect( kwin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
- connect( kwin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
- connect( kwin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
+ connect( twin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
+ connect( twin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
+ connect( twin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
+ connect( twin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) );
connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) );
// register existing windows
- const TQValueList<WId> windows = kwin_module->windows();
+ const TQValueList<WId> windows = twin_module->windows();
for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it )
slotWindowAdded(*it);
- connect( kwin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
+ connect( twin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
slotStartWindowListeners();
}
KomposeTaskManager::~KomposeTaskManager()
{
- delete kwin_module;
+ delete twin_module;
}
/**
@@ -137,9 +137,9 @@ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds )
void KomposeTaskManager::slotStartWindowListeners()
{
- disconnect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
+ disconnect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
SLOT(slotWindowChanged( WId, unsigned int )) );
- connect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
+ connect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
SLOT(slotWindowChanged( WId, unsigned int )) );
}
@@ -220,7 +220,7 @@ void KomposeTaskManager::slotWindowAdded(WId w )
return;
kdDebug() << "KomposeTaskManager::slotWindowAdded(WId " << w <<" ) - Adding KomposeTask" << endl;
- KomposeTask* t = new KomposeTask(w, kwin_module, this);
+ KomposeTask* t = new KomposeTask(w, twin_module, this);
tasklist.append(t);
emit newTask( t );
@@ -261,7 +261,7 @@ void KomposeTaskManager::slotUpdateScreenshots( bool switchDesktops )
void KomposeTaskManager::simulatePasvScreenshotEvent()
{
kdDebug() << "KomposeTaskManager::simulatePasvScreenshotEvent()" << endl;
- slotTaskActivated( kwin_module->activeWindow() );
+ slotTaskActivated( twin_module->activeWindow() );
}
/**
@@ -293,8 +293,8 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
{
if(!task) return false;
- for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast();
- it != kwin_module->stackingOrder().end(); --it )
+ for (TQValueList<WId>::ConstIterator it = twin_module->stackingOrder().fromLast();
+ it != twin_module->stackingOrder().end(); --it )
{
for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() )
{
@@ -313,7 +313,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
TQString KomposeTaskManager::getDesktopName(int desk) const
{
- return kwin_module->desktopName(desk);
+ return twin_module->desktopName(desk);
}
@@ -381,7 +381,7 @@ void KomposeTaskManager::slotCurrentDesktopChanged(int d)
int KomposeTaskManager::getCurrentDesktopNum()
{
- return kwin_module->currentDesktop();
+ return twin_module->currentDesktop();
}
#include "komposetaskmanager.moc"
diff --git a/src/komposetaskmanager.h b/src/komposetaskmanager.h
index f311ae7..510096c 100644
--- a/src/komposetaskmanager.h
+++ b/src/komposetaskmanager.h
@@ -77,7 +77,7 @@ protected:
KomposeTask* findTask(WId w, bool wmFrameIds = false);
private:
- KWinModule* kwin_module;
+ KWinModule* twin_module;
TaskList tasklist; // list of tasks handled by the WM
int numDesks; // total num of desks
diff --git a/src/komposetaskprefswidget.cpp b/src/komposetaskprefswidget.cpp
index bbc67f6..3254158 100644
--- a/src/komposetaskprefswidget.cpp
+++ b/src/komposetaskprefswidget.cpp
@@ -16,19 +16,19 @@
#include "komposetaskprefswidget.h"
#include "komposesettings.h"
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kshortcut.h>
-#include <klocale.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
+#include <tdeshortcut.h>
+#include <tdelocale.h>
#include <tqiconset.h>
KomposeTaskPrefsWidget::KomposeTaskPrefsWidget(KomposeTaskWidget *parent, const char *name)
: TQDockArea(TQt::Horizontal , TQDockArea::Normal, parent, name)
{
- KToolBar* pToolBar = new KToolBar( this, i18n("Task Actions") );
+ TDEToolBar* pToolBar = new TDEToolBar( this, i18n("Task Actions") );
pToolBar->setLabel(i18n("Task"));
pToolBar->setResizeEnabled ( false );
pToolBar->setMovingEnabled ( false );
diff --git a/src/komposetaskvisualizer.cpp b/src/komposetaskvisualizer.cpp
index 5348768..9e21eaf 100644
--- a/src/komposetaskvisualizer.cpp
+++ b/src/komposetaskvisualizer.cpp
@@ -17,7 +17,7 @@
#include <tqpixmap.h>
#include <tqtimer.h>
-#include <kwin.h>
+#include <twin.h>
#include <netwm.h>
#include <tqapplication.h>
#include <kdebug.h>
diff --git a/src/komposetaskwidget.cpp b/src/komposetaskwidget.cpp
index dfba330..24522a3 100644
--- a/src/komposetaskwidget.cpp
+++ b/src/komposetaskwidget.cpp
@@ -40,11 +40,11 @@
#include <tqfont.h>
#include <kcursor.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <kdebug.h>
@@ -345,18 +345,18 @@ void KomposeTaskWidget::setGeometry( const TQRect &rect )
void KomposeTaskWidget::initActions()
{
- taskActionCollection = new KActionCollection( this );
+ taskActionCollection = new TDEActionCollection( this );
- actCloseTask = new KAction( i18n("Close"), "fileclose", Key_Delete , task,
+ actCloseTask = new TDEAction( i18n("Close"), "fileclose", Key_Delete , task,
SLOT( close() ), taskActionCollection, "closeTask" );
actCloseTask->setToolTip(i18n("Close"));
- actMinimizeRestoreTask = new KAction( i18n("Minimize/Restore"), "", KShortcut() , this,
+ actMinimizeRestoreTask = new TDEAction( i18n("Minimize/Restore"), "", TDEShortcut() , this,
SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" );
}
void KomposeTaskWidget::initMenu()
{
- menu = new KPopupMenu();
+ menu = new TDEPopupMenu();
actMinimizeRestoreTask->plug(menu);
@@ -393,9 +393,9 @@ void KomposeTaskWidget::initMenu()
void KomposeTaskWidget::setActionIcons( bool inverse )
{
if ( ( task->isIconified() && !inverse ) || ( !task->isIconified() && inverse ) )
- actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "up", KIcon::NoGroup, 16 ) );
+ actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "up", TDEIcon::NoGroup, 16 ) );
else
- actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "bottom", KIcon::NoGroup, 16 ) );
+ actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "bottom", TDEIcon::NoGroup, 16 ) );
}
void KomposeTaskWidget::slotMinimizeRestoreToggled()
diff --git a/src/komposetaskwidget.h b/src/komposetaskwidget.h
index d83818a..82d03c4 100644
--- a/src/komposetaskwidget.h
+++ b/src/komposetaskwidget.h
@@ -29,9 +29,9 @@
class KomposeTask;
class KomposeLayout;
-class KPopupMenu;
-class KAction;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEAction;
+class TDEActionCollection;
/**
@author Hans Oischinger
@@ -49,8 +49,8 @@ public:
double getAspectRatio();
KomposeTask* getTask() const { return task; };
- KAction* getActMinimizeRestoreTask() { return actMinimizeRestoreTask; }
- KAction* getActCloseTask() { return actCloseTask; }
+ TDEAction* getActMinimizeRestoreTask() { return actMinimizeRestoreTask; }
+ TDEAction* getActCloseTask() { return actCloseTask; }
signals:
void requestRemoval(KomposeWidget*);
@@ -90,11 +90,11 @@ private:
KomposeTask* task;
KomposeTaskPrefsWidget *prefWidget;
- KPopupMenu *menu;
+ TDEPopupMenu *menu;
- KActionCollection *taskActionCollection;
- KAction *actMinimizeRestoreTask;
- KAction *actCloseTask;
+ TDEActionCollection *taskActionCollection;
+ TDEAction *actMinimizeRestoreTask;
+ TDEAction *actCloseTask;
};
#endif
diff --git a/src/komposeviewmanager.cpp b/src/komposeviewmanager.cpp
index 0792a55..9b4da6e 100644
--- a/src/komposeviewmanager.cpp
+++ b/src/komposeviewmanager.cpp
@@ -23,8 +23,8 @@
#include <tqwidgetlist.h>
#include <tqdesktopwidget.h>
-#include <kwin.h>
-#include <kapplication.h>
+#include <twin.h>
+#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/src/main.cpp b/src/main.cpp
index 7936adc..0163fb9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
static const char description[] =
@@ -33,11 +33,11 @@ static const char description[] =
static const char version[] = "0.5.3";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "nosystray", I18N_NOOP( "Do not show the systray icon" ), 0 },
{ "singleshot", I18N_NOOP( "Display the default view and exit (non daemon mode)" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
void myMessageOutput( TQtMsgType type, const char *msg )
@@ -61,16 +61,16 @@ int main(int argc, char **argv)
{
// qInstallMsgHandler( myMessageOutput );
- KAboutData about("kompose", I18N_NOOP("Kompose"), version, description,
- KAboutData::License_GPL, "(C) 2005 Hans Oischinger", "", "http://developer.berlios.de/projects/kompose", "hans.oischinger@kde-mail.net");
+ TDEAboutData about("kompose", I18N_NOOP("Kompose"), version, description,
+ TDEAboutData::License_GPL, "(C) 2005 Hans Oischinger", "", "http://developer.berlios.de/projects/kompose", "hans.oischinger@kde-mail.net");
about.addAuthor( "Hans Oischinger", 0, "hans.oischinger@kde-mail.net" );
- KCmdLineArgs::init(argc, argv, &about);
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init(argc, argv, &about);
+ TDECmdLineArgs::addCmdLineOptions( options );
Kompose *app = new Kompose();
// no session.. just start up normally
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( !args->isSet("systray") )
{