summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/CMakeL10n.txt6
-rw-r--r--korganizer/CMakeLists.txt22
-rw-r--r--korganizer/aboutdata.h2
-rw-r--r--korganizer/actionmanager.cpp304
-rw-r--r--korganizer/actionmanager.h4
-rw-r--r--korganizer/agendaview.cpp6
-rw-r--r--korganizer/agendaview.h2
-rw-r--r--korganizer/archivedialog.cpp12
-rw-r--r--korganizer/archivedialog.h2
-rw-r--r--korganizer/calendarview.cpp168
-rw-r--r--korganizer/calendarview.h4
-rw-r--r--korganizer/datechecker.cpp4
-rw-r--r--korganizer/datechecker.h2
-rw-r--r--korganizer/datenavigator.h2
-rw-r--r--korganizer/datenavigatorcontainer.cpp44
-rw-r--r--korganizer/datenavigatorcontainer.h2
-rw-r--r--korganizer/dcopcalendar.desktop54
-rw-r--r--korganizer/eventarchiver.h2
-rw-r--r--korganizer/exportwebdialog.cpp12
-rw-r--r--korganizer/exportwebdialog.h2
-rw-r--r--korganizer/filteredit_base.ui16
-rw-r--r--korganizer/filtereditdialog.cpp26
-rw-r--r--korganizer/filtereditdialog.h4
-rw-r--r--korganizer/freebusymanager.cpp24
-rw-r--r--korganizer/freebusymanager.h4
-rw-r--r--korganizer/freebusyurldialog.h4
-rw-r--r--korganizer/history.h2
-rw-r--r--korganizer/importdialog.cpp2
-rw-r--r--korganizer/importdialog.h2
-rw-r--r--korganizer/incidencechanger.h2
-rw-r--r--korganizer/interfaces/calendar/CMakeLists.txt8
-rw-r--r--korganizer/interfaces/calendar/calendardecoration.desktop62
-rw-r--r--korganizer/interfaces/calendar/calendarplugin.desktop66
-rw-r--r--korganizer/interfaces/korganizer/CMakeLists.txt8
-rw-r--r--korganizer/interfaces/korganizer/baseview.h4
-rw-r--r--korganizer/interfaces/korganizer/incidencechangerbase.h2
-rw-r--r--korganizer/interfaces/korganizer/korganizerpart.desktop56
-rw-r--r--korganizer/interfaces/korganizer/korgprintplugin.desktop56
-rw-r--r--korganizer/interfaces/korganizer/part.h2
-rw-r--r--korganizer/journalentry.cpp44
-rw-r--r--korganizer/journalentry.h4
-rw-r--r--korganizer/kdatenavigator.cpp26
-rw-r--r--korganizer/kdatenavigator.h2
-rw-r--r--korganizer/koagenda.cpp90
-rw-r--r--korganizer/koagenda.h6
-rw-r--r--korganizer/koagendaitem.h2
-rw-r--r--korganizer/koagendaview.cpp108
-rw-r--r--korganizer/koagendaview.h8
-rw-r--r--korganizer/koapp.h2
-rw-r--r--korganizer/koattendeeeditor.cpp24
-rw-r--r--korganizer/koattendeeeditor.h2
-rw-r--r--korganizer/kocore.h2
-rw-r--r--korganizer/kocounterdialog.cpp4
-rw-r--r--korganizer/kocounterdialog.h2
-rw-r--r--korganizer/kodaymatrix.cpp8
-rw-r--r--korganizer/kodaymatrix.h2
-rw-r--r--korganizer/kodialogmanager.cpp94
-rw-r--r--korganizer/kodialogmanager.h2
-rw-r--r--korganizer/koeditoralarms.cpp38
-rw-r--r--korganizer/koeditoralarms.h2
-rw-r--r--korganizer/koeditoralarms_base.ui8
-rw-r--r--korganizer/koeditorattachments.cpp50
-rw-r--r--korganizer/koeditorattachments.h6
-rw-r--r--korganizer/koeditordetails.cpp10
-rw-r--r--korganizer/koeditordetails.h4
-rw-r--r--korganizer/koeditorfreebusy.cpp58
-rw-r--r--korganizer/koeditorfreebusy.h2
-rw-r--r--korganizer/koeditorgeneral.cpp26
-rw-r--r--korganizer/koeditorgeneral.h4
-rw-r--r--korganizer/koeditorgeneralevent.cpp38
-rw-r--r--korganizer/koeditorgeneralevent.h2
-rw-r--r--korganizer/koeditorgeneraljournal.cpp6
-rw-r--r--korganizer/koeditorgeneraljournal.h2
-rw-r--r--korganizer/koeditorgeneraltodo.cpp30
-rw-r--r--korganizer/koeditorgeneraltodo.h2
-rw-r--r--korganizer/koeditorrecurrence.cpp72
-rw-r--r--korganizer/koeditorrecurrence.h10
-rw-r--r--korganizer/koeventeditor.cpp72
-rw-r--r--korganizer/koeventeditor.h2
-rw-r--r--korganizer/koeventpopupmenu.cpp24
-rw-r--r--korganizer/koeventpopupmenu.h2
-rw-r--r--korganizer/koeventview.cpp36
-rw-r--r--korganizer/koeventview.h2
-rw-r--r--korganizer/koeventviewer.cpp2
-rw-r--r--korganizer/koeventviewer.h4
-rw-r--r--korganizer/koeventviewerdialog.cpp2
-rw-r--r--korganizer/koeventviewerdialog.h4
-rw-r--r--korganizer/koglobals.h2
-rw-r--r--korganizer/kogroupware.cpp26
-rw-r--r--korganizer/kogroupware.h2
-rw-r--r--korganizer/kogroupwareprefspage.ui10
-rw-r--r--korganizer/kohelper.h2
-rw-r--r--korganizer/koincidenceeditor.cpp20
-rw-r--r--korganizer/koincidenceeditor.h2
-rw-r--r--korganizer/kojournaleditor.h2
-rw-r--r--korganizer/kojournalview.cpp28
-rw-r--r--korganizer/kojournalview.h2
-rw-r--r--korganizer/kolistview.cpp30
-rw-r--r--korganizer/kolistview.h2
-rw-r--r--korganizer/komessagebox.cpp6
-rw-r--r--korganizer/komonthview.cpp26
-rw-r--r--korganizer/komonthview.h6
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/koprefsdialog.cpp88
-rw-r--r--korganizer/koprefsdialog.h10
-rw-r--r--korganizer/korgac/CMakeLists.txt6
-rw-r--r--korganizer/korgac/alarmdialog.cpp30
-rw-r--r--korganizer/korgac/alarmdialog.h2
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp22
-rw-r--r--korganizer/korgac/alarmdockwindow.h2
-rw-r--r--korganizer/korgac/koalarmclient.cpp14
-rw-r--r--korganizer/korgac/koalarmclient.h2
-rw-r--r--korganizer/korgac/korgac.desktop88
-rw-r--r--korganizer/korganizer.cpp20
-rw-r--r--korganizer/korganizer.desktop137
-rw-r--r--korganizer/korganizer.h2
-rw-r--r--korganizer/korganizer_configcolors.desktop174
-rw-r--r--korganizer/korganizer_configdesignerfields.desktop144
-rw-r--r--korganizer/korganizer_configfonts.desktop171
-rw-r--r--korganizer/korganizer_configfreebusy.desktop143
-rw-r--r--korganizer/korganizer_configgroupautomation.desktop147
-rw-r--r--korganizer/korganizer_configgroupscheduling.desktop145
-rw-r--r--korganizer/korganizer_configmain.desktop154
-rw-r--r--korganizer/korganizer_configplugins.desktop138
-rw-r--r--korganizer/korganizer_configtime.desktop161
-rw-r--r--korganizer/korganizer_configviews.desktop156
-rw-r--r--korganizer/korganizer_part.cpp10
-rw-r--r--korganizer/korganizer_part.h2
-rw-r--r--korganizer/korganizerifaceimpl.h2
-rw-r--r--korganizer/kotimelineview.cpp24
-rw-r--r--korganizer/kotimelineview.h2
-rw-r--r--korganizer/kotodoeditor.cpp34
-rw-r--r--korganizer/kotodoeditor.h2
-rw-r--r--korganizer/kotodoview.cpp104
-rw-r--r--korganizer/kotodoview.h4
-rw-r--r--korganizer/koviewmanager.cpp132
-rw-r--r--korganizer/koviewmanager.h2
-rw-r--r--korganizer/kowhatsnextview.cpp2
-rw-r--r--korganizer/kowhatsnextview.h4
-rw-r--r--korganizer/kowindowlist.h2
-rw-r--r--korganizer/multiagendaview.cpp126
-rw-r--r--korganizer/multiagendaview.h4
-rw-r--r--korganizer/navigatorbar.cpp12
-rw-r--r--korganizer/navigatorbar.h4
-rw-r--r--korganizer/plugins/datenums/CMakeLists.txt6
-rw-r--r--korganizer/plugins/datenums/configdialog.h2
-rw-r--r--korganizer/plugins/datenums/datenums.desktop92
-rw-r--r--korganizer/plugins/exchange/CMakeLists.txt7
-rw-r--r--korganizer/plugins/exchange/exchange.cpp26
-rw-r--r--korganizer/plugins/exchange/exchange.desktop94
-rw-r--r--korganizer/plugins/exchange/exchange.h2
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp6
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.h2
-rw-r--r--korganizer/plugins/exchange/exchangedialog.h2
-rw-r--r--korganizer/plugins/hebrew/CMakeLists.txt6
-rw-r--r--korganizer/plugins/hebrew/configdialog.h2
-rw-r--r--korganizer/plugins/hebrew/hebrew.desktop94
-rw-r--r--korganizer/plugins/printing/journal/CMakeLists.txt6
-rw-r--r--korganizer/plugins/printing/journal/calprintjournalconfig_base.ui7
-rw-r--r--korganizer/plugins/printing/journal/journalprint.desktop88
-rw-r--r--korganizer/plugins/printing/list/listprint.desktop88
-rw-r--r--korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui7
-rw-r--r--korganizer/plugins/printing/whatsnext/whatsnextprint.desktop88
-rw-r--r--korganizer/plugins/printing/year/CMakeLists.txt6
-rw-r--r--korganizer/plugins/printing/year/yearprint.desktop77
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp10
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/projectview/projectview.cpp2
-rw-r--r--korganizer/plugins/projectview/projectview.desktop105
-rw-r--r--korganizer/plugins/projectview/projectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h2
-rw-r--r--korganizer/plugins/timespanview/lineview.h2
-rw-r--r--korganizer/plugins/timespanview/timeline.h2
-rw-r--r--korganizer/plugins/timespanview/timespanview.cpp2
-rw-r--r--korganizer/plugins/timespanview/timespanview.desktop87
-rw-r--r--korganizer/plugins/timespanview/timespanview.h2
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.cpp10
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.h2
-rw-r--r--korganizer/previewdialog.cpp4
-rw-r--r--korganizer/previewdialog.h2
-rw-r--r--korganizer/printing/calprintdayconfig_base.ui5
-rw-r--r--korganizer/printing/calprinter.cpp4
-rw-r--r--korganizer/printing/calprinter.h6
-rw-r--r--korganizer/printing/calprintpluginbase.cpp16
-rw-r--r--korganizer/printing/calprintpluginbase.h2
-rw-r--r--korganizer/printing/calprinttodoconfig_base.ui8
-rw-r--r--korganizer/printing/calprintweetdeconfig_base.ui5
-rw-r--r--korganizer/printing/cellitem.h2
-rw-r--r--korganizer/publishdialog.cpp24
-rw-r--r--korganizer/publishdialog.h2
-rw-r--r--korganizer/resourceview.cpp76
-rw-r--r--korganizer/resourceview.h2
-rw-r--r--korganizer/searchdialog.cpp20
-rw-r--r--korganizer/searchdialog.h2
-rw-r--r--korganizer/statusdialog.cpp4
-rw-r--r--korganizer/statusdialog.h2
-rw-r--r--korganizer/templatemanagementdialog.cpp18
-rw-r--r--korganizer/templatemanagementdialog.h2
-rw-r--r--korganizer/timelabels.cpp8
-rw-r--r--korganizer/timelabels.h2
-rw-r--r--korganizer/urihandler.h2
202 files changed, 1498 insertions, 4214 deletions
diff --git a/korganizer/CMakeL10n.txt b/korganizer/CMakeL10n.txt
index a4933b27..eaff8124 100644
--- a/korganizer/CMakeL10n.txt
+++ b/korganizer/CMakeL10n.txt
@@ -4,3 +4,9 @@ tde_l10n_create_template(
CATALOG "korganizer"
SOURCES "." "tips"
)
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/korganizer-desktops/"
+ SOURCES *.desktop *.protocol
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt
index a5e8aff1..00bc3577 100644
--- a/korganizer/CMakeLists.txt
+++ b/korganizer/CMakeLists.txt
@@ -53,21 +53,27 @@ link_directories(
tde_install_icons( )
-install( FILES
- korganizer.desktop
- DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE korganizer.desktop
+ PO_DIR korganizer-desktops
+)
-install( FILES
- dcopcalendar.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE dcopcalendar.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR korganizer-desktops
+)
-install( FILES
+tde_create_translated_desktop(
+ SOURCE
korganizer_configmain.desktop korganizer_configtime.desktop
korganizer_configviews.desktop korganizer_configcolors.desktop
korganizer_configfonts.desktop korganizer_configplugins.desktop
korganizer_configgroupscheduling.desktop korganizer_configfreebusy.desktop
korganizer_configdesignerfields.desktop webcal.protocol
- DESTINATION ${SERVICES_INSTALL_DIR} )
+ DESTINATION ${SERVICES_INSTALL_DIR}
+ PO_DIR korganizer-desktops
+)
install( FILES
uninstall.desktop
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 0edf9811..9edf278a 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -25,7 +25,7 @@
#define KORG_ABOUTDATA_H
#include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
namespace KOrg {
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index f8a4e4ad..abde9092 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -127,7 +127,7 @@ void ActionManager::init()
mWindowList = new KOWindowList;
// Show tip of the day, when the first calendar is shown.
if ( !mIsPart )
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( showTipOnStart() ) );
}
// Note: We need this ActionManager to be fully constructed, and
// parent() to have a valid reference to it before the following
@@ -138,27 +138,27 @@ void ActionManager::init()
// set up autoSaving stuff
mAutoSaveTimer = new TQTimer( this );
- connect( mAutoSaveTimer,TQT_SIGNAL( timeout() ), TQT_SLOT( checkAutoSave() ) );
+ connect( mAutoSaveTimer,TQ_SIGNAL( timeout() ), TQ_SLOT( checkAutoSave() ) );
if ( KOPrefs::instance()->mAutoSave &&
KOPrefs::instance()->mAutoSaveInterval > 0 ) {
mAutoSaveTimer->start( 1000 * 60 * KOPrefs::instance()->mAutoSaveInterval );
}
mAutoArchiveTimer = new TQTimer( this );
- connect( mAutoArchiveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotAutoArchive() ) );
+ connect( mAutoArchiveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotAutoArchive() ) );
// First auto-archive should be in 5 minutes (like in kmail).
if ( KOPrefs::instance()->mAutoArchive )
mAutoArchiveTimer->start( 5 * 60 * 1000, true ); // singleshot
setTitle();
- connect( mCalendarView, TQT_SIGNAL( modifiedChanged( bool ) ), TQT_SLOT( setTitle() ) );
- connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) );
+ connect( mCalendarView, TQ_SIGNAL( modifiedChanged( bool ) ), TQ_SLOT( setTitle() ) );
+ connect( mCalendarView, TQ_SIGNAL( configChanged() ), TQ_SLOT( updateConfig() ) );
- connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
- connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ),
- TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) );
+ connect( mCalendarView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ this, TQ_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( exportHTML( HTMLExportSettings * ) ),
+ this, TQ_SLOT( exportHTML( HTMLExportSettings * ) ) );
processIncidenceSelection( 0, TQDate() );
@@ -198,13 +198,13 @@ void ActionManager::createCalendarResources()
mCalendarView->addExtension( &factory );
mResourceView = factory.resourceView();
- connect( mCalendarResources, TQT_SIGNAL( calendarChanged() ),
- mCalendarView, TQT_SLOT( resourcesChanged() ) );
- connect( mCalendarResources, TQT_SIGNAL( signalErrorMessage( const TQString & ) ),
- mCalendarView, TQT_SLOT( showErrorMessage( const TQString & ) ) );
+ connect( mCalendarResources, TQ_SIGNAL( calendarChanged() ),
+ mCalendarView, TQ_SLOT( resourcesChanged() ) );
+ connect( mCalendarResources, TQ_SIGNAL( signalErrorMessage( const TQString & ) ),
+ mCalendarView, TQ_SLOT( showErrorMessage( const TQString & ) ) );
- connect( mCalendarView, TQT_SIGNAL( configChanged() ),
- TQT_SLOT( updateConfig() ) );
+ connect( mCalendarView, TQ_SIGNAL( configChanged() ),
+ TQ_SLOT( updateConfig() ) );
initCalendar( mCalendarResources );
}
@@ -227,58 +227,58 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( mIsPart ) {
if ( mMainWindow->hasDocument() ) {
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(file_new()), mACollection, "korganizer_openNew" );
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection, "korganizer_open" );
- mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ),
+ KStdAction::openNew( this, TQ_SLOT(file_new()), mACollection, "korganizer_openNew" );
+ KStdAction::open( this, TQ_SLOT( file_open() ), mACollection, "korganizer_open" );
+ mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ),
mACollection, "korganizer_openRecent" );
- KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" );
- KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection,
+ KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection, "korganizer_revert" );
+ KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection,
"korganizer_saveAs" );
- KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" );
+ KStdAction::save( this, TQ_SLOT( file_save() ), mACollection, "korganizer_save" );
}
- KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" );
+ KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection, "korganizer_print" );
} else {
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( file_new() ), mACollection );
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection );
- mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ),
+ KStdAction::openNew( this, TQ_SLOT( file_new() ), mACollection );
+ KStdAction::open( this, TQ_SLOT( file_open() ), mACollection );
+ mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ),
mACollection );
if ( mMainWindow->hasDocument() ) {
- KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection );
- KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection );
- KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection );
+ KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection );
+ KStdAction::save( this, TQ_SLOT( file_save() ), mACollection );
+ KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection );
}
- KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection );
+ KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection );
}
//~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ),
+ new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQ_SLOT( file_merge() ),
mACollection, "import_icalendar" );
- new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ),
+ new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQ_SLOT( file_icalimport() ),
mACollection, "import_ical" );
new TDEAction( i18n("Get &Hot New Stuff..."), 0, this,
- TQT_SLOT( downloadNewStuff() ), mACollection,
+ TQ_SLOT( downloadNewStuff() ), mACollection,
"downloadnewstuff" );
new TDEAction( i18n("Export &Web Page..."), "webexport", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ),
+ mCalendarView, TQ_SLOT( exportWeb() ),
mACollection, "export_web" );
new TDEAction( i18n("&iCalendar..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ),
+ mCalendarView, TQ_SLOT( exportICalendar() ),
mACollection, "export_icalendar" );
new TDEAction( i18n("&vCalendar..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ),
+ mCalendarView, TQ_SLOT( exportVCalendar() ),
mACollection, "export_vcalendar" );
- new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this),
- TQT_SLOT( uploadNewStuff() ), mACollection,
+ new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this,
+ TQ_SLOT( uploadNewStuff() ), mACollection,
"uploadnewstuff" );
- new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ),
+ new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQ_SLOT( file_archive() ),
mACollection, "file_archive" );
new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection,
+ mCalendarView, TQ_SLOT( purgeCompleted() ), mACollection,
"purge_completed" );
@@ -289,45 +289,45 @@ void ActionManager::initActions()
KOrg::History *h = mCalendarView->history();
if ( mIsPart ) {
// edit menu
- mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( mCalendarView, TQ_SLOT( edit_cut() ),
mACollection, "korganizer_cut" );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( mCalendarView, TQ_SLOT( edit_copy() ),
mACollection, "korganizer_copy" );
- pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( mCalendarView, TQ_SLOT( edit_paste() ),
mACollection, "korganizer_paste" );
- mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ),
+ mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ),
mACollection, "korganizer_undo" );
- mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ),
+ mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ),
mACollection, "korganizer_redo" );
} else {
- mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ),
+ mCutAction = KStdAction::cut( mCalendarView,TQ_SLOT( edit_cut() ),
mACollection );
- mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ),
+ mCopyAction = KStdAction::copy( mCalendarView,TQ_SLOT( edit_copy() ),
mACollection );
- pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ),
+ pasteAction = KStdAction::paste( mCalendarView,TQ_SLOT( edit_paste() ),
mACollection );
- mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection );
- mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection );
+ mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection );
+ mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection );
}
mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ),
+ mCalendarView, TQ_SLOT( appointment_delete() ),
mACollection, "edit_delete" );
if ( mIsPart ) {
- KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ),
mACollection, "korganizer_find" );
} else {
- KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
+ KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ),
mACollection );
}
pasteAction->setEnabled( false );
mUndoAction->setEnabled( false );
mRedoAction->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL( pasteEnabled( bool ) ),
- pasteAction, TQT_SLOT( setEnabled( bool ) ) );
- connect( h, TQT_SIGNAL( undoAvailable( const TQString & ) ),
- TQT_SLOT( updateUndoAction( const TQString & ) ) );
- connect( h, TQT_SIGNAL( redoAvailable( const TQString & ) ),
- TQT_SLOT( updateRedoAction( const TQString & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( pasteEnabled( bool ) ),
+ pasteAction, TQ_SLOT( setEnabled( bool ) ) );
+ connect( h, TQ_SIGNAL( undoAvailable( const TQString & ) ),
+ TQ_SLOT( updateUndoAction( const TQString & ) ) );
+ connect( h, TQ_SIGNAL( redoAvailable( const TQString & ) ),
+ TQ_SLOT( updateRedoAction( const TQString & ) ) );
@@ -337,83 +337,83 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("What's &Next"),
KOGlobals::self()->smallIcon( "whatsnext" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWhatsNextView() ),
mACollection, "view_whatsnext" );
new TDEAction( i18n("&Day"),
KOGlobals::self()->smallIcon( "1day" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showDayView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showDayView() ),
mACollection, "view_day" );
mNextXDays = new TDEAction( "",
KOGlobals::self()->smallIcon( "xdays" ), 0,
mCalendarView->viewManager(),
- TQT_SLOT( showNextXView() ),
+ TQ_SLOT( showNextXView() ),
mACollection, "view_nextx" );
mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days",
KOPrefs::instance()->mNextXDays ) );
new TDEAction( i18n("W&ork Week"),
KOGlobals::self()->smallIcon( "5days" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWorkWeekView() ),
mACollection, "view_workweek" );
new TDEAction( i18n("&Week"),
KOGlobals::self()->smallIcon( "7days" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showWeekView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showWeekView() ),
mACollection, "view_week" );
new TDEAction( i18n("&Month"),
KOGlobals::self()->smallIcon( "month" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showMonthView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showMonthView() ),
mACollection, "view_month" );
new TDEAction( i18n("&List"),
KOGlobals::self()->smallIcon( "list" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showListView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showListView() ),
mACollection, "view_list" );
new TDEAction( i18n("&To-do List"),
KOGlobals::self()->smallIcon( "todo" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showTodoView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showTodoView() ),
mACollection, "view_todo" );
new TDEAction( i18n("&Journal"),
KOGlobals::self()->smallIcon( "journal" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showJournalView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showJournalView() ),
mACollection, "view_journal" );
new TDEAction( i18n("&Timeline View"),
KOGlobals::self()->smallIcon( "timeline" ), 0,
- mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ),
+ mCalendarView->viewManager(), TQ_SLOT( showTimelineView() ),
mACollection, "view_timeline" );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("&Refresh"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ),
+ mCalendarView, TQ_SLOT( updateView() ),
mACollection, "update" );
// TODO:
// new TDEAction( i18n("Hide &Completed To-dos"), 0,
-// mCalendarView, TQT_SLOT( toggleHideCompleted() ),
+// mCalendarView, TQ_SLOT( toggleHideCompleted() ),
// mACollection, "hide_completed_todos" );
mFilterAction = new TDESelectAction( i18n("F&ilter"), 0,
mACollection, "filter_select" );
mFilterAction->setEditable( false );
- connect( mFilterAction, TQT_SIGNAL( activated(int) ),
- mCalendarView, TQT_SLOT( filterActivated( int ) ) );
- connect( mCalendarView, TQT_SIGNAL( newFilterListSignal( const TQStringList & ) ),
- mFilterAction, TQT_SLOT( setItems( const TQStringList & ) ) );
- connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ),
- mFilterAction, TQT_SLOT( setCurrentItem( int ) ) );
- connect( mCalendarView, TQT_SIGNAL( filterChanged() ),
- TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) );
+ connect( mFilterAction, TQ_SIGNAL( activated(int) ),
+ mCalendarView, TQ_SLOT( filterActivated( int ) ) );
+ connect( mCalendarView, TQ_SIGNAL( newFilterListSignal( const TQStringList & ) ),
+ mFilterAction, TQ_SLOT( setItems( const TQStringList & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( selectFilterSignal( int ) ),
+ mFilterAction, TQ_SLOT( setCurrentItem( int ) ) );
+ connect( mCalendarView, TQ_SIGNAL( filterChanged() ),
+ this, TQ_SLOT( setTitle() ) );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// TODO: try to find / create better icons for the following 4 actions
new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomInHorizontally() ),
mACollection, "zoom_in_horizontally" );
new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomOutHorizontally() ),
mACollection, "zoom_out_horizontally" );
new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomInVertically() ),
mACollection, "zoom_in_vertically" );
new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0,
- mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ),
+ mCalendarView->viewManager(), TQ_SLOT( zoomOutVertically() ),
mACollection, "zoom_out_vertically" );
@@ -422,73 +422,73 @@ void ActionManager::initActions()
//************************** Actions MENU *********************************
new TDEAction( i18n("Go to &Today"), "today", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ),
+ mCalendarView,TQ_SLOT( goToday() ),
mACollection, "go_today" );
bool isRTL = TQApplication::reverseLayout();
action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ),
+ mCalendarView,TQ_SLOT( goPrevious() ),
mACollection, "go_previous" );
// Changing the action text by setText makes the toolbar button disappear.
// This has to be fixed first, before the connects below can be reenabled.
/*
- connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
- action, TQT_SLOT( setText( const TQString & ) ) );
- connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/
+ connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ),
+ action, TQ_SLOT( setText( const TQString & ) ) );
+ connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ),
+ this, TQ_SLOT( dumpText( const TQString & ) ) );*/
action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ),
+ mCalendarView,TQ_SLOT( goNext() ),
mACollection, "go_next" );
/*
- connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ),
- action,TQT_SLOT( setText( const TQString & ) ) );
+ connect( mCalendarView,TQ_SIGNAL( changeNavStringNext( const TQString & ) ),
+ action,TQ_SLOT( setText( const TQString & ) ) );
*/
//************************** Actions MENU *********************************
new TDEAction( i18n("New E&vent..."),
KOGlobals::self()->smallIcon( "newappointment" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()),
+ mCalendarView, TQ_SLOT(newEvent()),
mACollection, "new_event" );
new TDEAction( i18n("New &To-do..."),
KOGlobals::self()->smallIcon( "newtodo" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()),
+ mCalendarView, TQ_SLOT(newTodo()),
mACollection, "new_todo" );
action = new TDEAction( i18n("New Su&b-to-do..."), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ),
+ mCalendarView,TQ_SLOT( newSubTodo() ),
mACollection, "new_subtodo" );
action->setEnabled( false );
- connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ),
- action,TQT_SLOT( setEnabled( bool ) ) );
+ connect( mCalendarView,TQ_SIGNAL( todoSelected( bool ) ),
+ action,TQ_SLOT( setEnabled( bool ) ) );
new TDEAction( i18n("New &Journal..."),
KOGlobals::self()->smallIcon( "newjournal" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()),
+ mCalendarView, TQ_SLOT(newJournal()),
mACollection, "new_journal" );
mShowIncidenceAction = new TDEAction( i18n("&Show"), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ),
+ mCalendarView,TQ_SLOT( showIncidence() ),
mACollection, "show_incidence" );
mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ),
+ mCalendarView,TQ_SLOT( editIncidence() ),
mACollection, "edit_incidence" );
mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()),
+ mCalendarView,TQ_SLOT( deleteIncidence()),
mACollection, "delete_incidence" );
action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ),
+ mCalendarView,TQ_SLOT( todo_unsub() ),
mACollection, "unsub_todo" );
action->setEnabled( false );
- connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ),
- action,TQT_SLOT( setEnabled( bool ) ) );
+ connect( mCalendarView,TQ_SIGNAL( subtodoSelected( bool ) ),
+ action,TQ_SLOT( setEnabled( bool ) ) );
// TODO: Add item to move the incidence to different resource
// mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0,
-// mCalendarView, TQT_SLOT( assignResource()),
+// mCalendarView, TQ_SLOT( assignResource()),
// mACollection, "assign_resource" );
// TODO: Add item to quickly toggle the reminder of a given incidence
// mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0,
-// mCalendarView, TQT_SLOT( toggleAlarm()),
+// mCalendarView, TQ_SLOT( toggleAlarm()),
// mACollection, "activate_alarm" );
@@ -496,65 +496,65 @@ void ActionManager::initActions()
//************************** SCHEDULE MENU ********************************
mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ),
+ mCalendarView, TQ_SLOT( schedule_publish() ),
mACollection, "schedule_publish" );
mPublishEvent->setEnabled( false );
mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ),
"mail_generic", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()),
+ mCalendarView, TQ_SLOT(schedule_request()),
mACollection, "schedule_request" );
mSendInvitation->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
- mSendInvitation, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)),
+ mSendInvitation, TQ_SLOT(setEnabled(bool)) );
mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()),
+ mCalendarView, TQ_SLOT(schedule_refresh()),
mACollection, "schedule_refresh" );
mRequestUpdate->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mRequestUpdate, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mRequestUpdate, TQ_SLOT(setEnabled(bool)) );
mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()),
+ mCalendarView, TQ_SLOT(schedule_cancel()),
mACollection, "schedule_cancel" );
mSendCancel->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
- mSendCancel, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)),
+ mSendCancel, TQ_SLOT(setEnabled(bool)) );
mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ),
"mail-reply-sender", 0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()),
+ mCalendarView,TQ_SLOT(schedule_reply()),
mACollection, "schedule_reply" );
mSendStatusUpdate->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mSendStatusUpdate, TQ_SLOT(setEnabled(bool)) );
mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()),
+ mCalendarView, TQ_SLOT(schedule_counter()),
mACollection, "schedule_counter" );
mRequestChange->setEnabled( false );
- connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
- mRequestChange, TQT_SLOT(setEnabled(bool)) );
+ connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)),
+ mRequestChange, TQ_SLOT(setEnabled(bool)) );
mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()),
+ mCalendarView, TQ_SLOT(schedule_forward()),
mACollection, "schedule_forward" );
mForwardEvent->setEnabled( false );
action = new TDEAction( i18n("&Mail Free Busy Information..."), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ),
+ mCalendarView, TQ_SLOT( mailFreeBusy() ),
mACollection, "mail_freebusy" );
action->setEnabled( true );
action = new TDEAction( i18n("&Upload Free Busy Information"), 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ),
+ mCalendarView, TQ_SLOT( uploadFreeBusy() ),
mACollection, "upload_freebusy" );
action->setEnabled( true );
if ( !mIsPart ) {
action = new TDEAction( i18n("&Addressbook"),"contents",0,
- TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ),
+ mCalendarView,TQ_SLOT( openAddressbook() ),
mACollection,"addressbook" );
}
@@ -565,13 +565,13 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ),
+ this, TQ_SLOT( toggleDateNavigator() ),
mACollection, "show_datenavigator" );
mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ),
+ this, TQ_SLOT( toggleTodoView() ),
mACollection, "show_todoview" );
mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ),
+ this, TQ_SLOT( toggleEventViewer() ),
mACollection, "show_eventviewer" );
TDEConfig *config = KOGlobals::self()->config();
config->setGroup( "Settings" );
@@ -590,10 +590,10 @@ void ActionManager::initActions()
if ( !mMainWindow->hasDocument() ) {
mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ),
+ this, TQ_SLOT( toggleResourceView() ),
mACollection, "show_resourceview" );
mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ),
+ this, TQ_SLOT( toggleResourceButtons() ),
mACollection, "show_resourcebuttons" );
mResourceViewShowAction->setChecked(
config->readBoolEntry( "ResourceViewVisible", true ) );
@@ -608,38 +608,38 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("Configure &Date && Time..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ),
+ this, TQ_SLOT( configureDateTime() ),
mACollection, "conf_datetime" );
// TODO: Add an item to show the resource management dlg
// new TDEAction( i18n("Manage &Resources..."), 0,
-// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ),
+// this, TQ_SLOT( manageResources() ),
// mACollection, "conf_resources" );
new TDEAction( i18n("Manage View &Filters..."), "configure", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ),
+ mCalendarView, TQ_SLOT( editFilters() ),
mACollection, "edit_filters" );
new TDEAction( i18n("Manage C&ategories..."), 0,
- TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ),
+ mCalendarView->dialogManager(), TQ_SLOT( showCategoryEditDialog() ),
mACollection, "edit_categories" );
if ( mIsPart ) {
new TDEAction( i18n("&Configure Calendar..."), "configure", 0,
- TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
+ mCalendarView, TQ_SLOT( edit_options() ),
mACollection, "korganizer_configure" );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
+ KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
mACollection, "korganizer_configure_shortcuts" );
} else {
- KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ),
+ KStdAction::preferences( mCalendarView, TQ_SLOT( edit_options() ),
mACollection );
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection );
+ KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection );
}
//**************************** HELP MENU **********************************
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection,
+ KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), mACollection,
"help_tipofday" );
// new TDEAction( i18n("Show Intro Page"), 0,
-// mCalendarView,TQT_SLOT( showIntro() ),
+// mCalendarView,TQ_SLOT( showIntro() ),
// mACollection,"show_intro" );
@@ -1293,8 +1293,8 @@ void ActionManager::configureDateTime()
TDEProcess *proc = new TDEProcess;
*proc << "tdecmshell" << "language";
- connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
- TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
+ connect( proc,TQ_SIGNAL( processExited( TDEProcess * ) ),
+ TQ_SLOT( configureDateTimeFinished( TDEProcess * ) ) );
if ( !proc->start() ) {
KMessageBox::sorry( dialogParent(),
@@ -1558,7 +1558,7 @@ TQPair<ResourceCalendar *, TQString> ActionManager::viewSubResourceCalendar()
cV = mCalendarView->viewManager()->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -1935,8 +1935,8 @@ bool ActionManager::queryClose()
// FIXME: Put main window into a state indicating final saving.
mIsClosing = true;
// FIXME: Close main window when save is finished
-// connect( mCalendarResources, TQT_SIGNAL( calendarSaved() ),
-// mMainWindow, TQT_SLOT( close() ) );
+// connect( mCalendarResources, TQ_SIGNAL( calendarSaved() ),
+// mMainWindow, TQ_SLOT( close() ) );
}
if ( mCalendarResources->isSaving() ) {
kdDebug(5850) << "ActionManager::queryClose(): isSaving" << endl;
@@ -2012,12 +2012,12 @@ void ActionManager::importCalendar( const KURL &url )
PreviewDialog *dialog;
dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() );
- connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ),
- TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
- connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ),
- TQT_SLOT( openURL( const KURL &, bool ) ) );
- connect( dialog, TQT_SIGNAL( addResource( const KURL & ) ),
- TQT_SLOT( addResource( const KURL & ) ) );
+ connect( dialog, TQ_SIGNAL( dialogFinished( PreviewDialog * ) ),
+ TQ_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
+ connect( dialog, TQ_SIGNAL( openURL( const KURL &, bool ) ),
+ TQ_SLOT( openURL( const KURL &, bool ) ) );
+ connect( dialog, TQ_SIGNAL( addResource( const KURL & ) ),
+ TQ_SLOT( addResource( const KURL & ) ) );
if ( dialog->loadCalendar() ) {
dialog->show();
@@ -2046,7 +2046,7 @@ void ActionManager::slotAutoArchive()
return;
mAutoArchiveTimer->stop();
EventArchiver archiver;
- connect( &archiver, TQT_SIGNAL( eventsDeleted() ), mCalendarView, TQT_SLOT( updateView() ) );
+ connect( &archiver, TQ_SIGNAL( eventsDeleted() ), mCalendarView, TQ_SLOT( updateView() ) );
archiver.runAuto( mCalendarView->calendar(), mCalendarView, false /*no gui*/ );
// restart timer with the correct delay ( especially useful for the first time )
slotAutoArchivingSettingsModified();
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 3494ecff..d7b8c417 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -30,7 +30,7 @@
#include <tqobject.h>
#include <kurl.h>
#include <korganizer/part.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include "kcalendariface.h"
@@ -72,7 +72,7 @@ using namespace KCal;
*/
class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
ActionManager( KXMLGUIClient *client, CalendarView *widget,
diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp
index df141789..e0519ba4 100644
--- a/korganizer/agendaview.cpp
+++ b/korganizer/agendaview.cpp
@@ -27,9 +27,9 @@ AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) :
{
KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal );
if ( calres ) {
- connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
}
}
diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h
index 32b58d3c..6e48f699 100644
--- a/korganizer/agendaview.h
+++ b/korganizer/agendaview.h
@@ -26,7 +26,7 @@ namespace KOrg {
/** Base class for single/multi agenda views. */
class AgendaView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 );
diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp
index 989be261..7b8eae46 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -76,7 +76,7 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name)
TQButtonGroup* radioBG = new TQButtonGroup( this );
radioBG->hide(); // just for the exclusive behavior
- connect( radioBG, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotActionChanged() ) );
+ connect( radioBG, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotActionChanged() ) );
TQHBoxLayout *dateLayout = new TQHBoxLayout(0);
mArchiveOnceRB = new TQRadioButton(i18n("Archive now items older than:"),topFrame);
@@ -147,10 +147,10 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name)
i18n("Select this option to delete old events and to-dos without saving them. "
"It is not possible to recover the events later."));
topLayout->addWidget(mDeleteCb);
- connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), mArchiveFile, TQT_SLOT(setDisabled(bool)));
- connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableUser1()));
- connect(mArchiveFile->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),
- this,TQT_SLOT(slotEnableUser1()));
+ connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), mArchiveFile, TQ_SLOT(setDisabled(bool)));
+ connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableUser1()));
+ connect(mArchiveFile->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),
+ this,TQ_SLOT(slotEnableUser1()));
// Load settings from KOPrefs
mExpiryTimeNumInput->setValue( KOPrefs::instance()->mExpiryTime );
@@ -194,7 +194,7 @@ void ArchiveDialog::slotActionChanged()
void ArchiveDialog::slotUser1()
{
EventArchiver archiver;
- connect( &archiver, TQT_SIGNAL( eventsDeleted() ), this, TQT_SLOT( slotEventsDeleted() ) );
+ connect( &archiver, TQ_SIGNAL( eventsDeleted() ), this, TQ_SLOT( slotEventsDeleted() ) );
KOPrefs::instance()->mAutoArchive = mAutoArchiveRB->isChecked();
KOPrefs::instance()->mExpiryTime = mExpiryTimeNumInput->value();
diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h
index 4d43f5da..2b22fe4f 100644
--- a/korganizer/archivedialog.h
+++ b/korganizer/archivedialog.h
@@ -40,7 +40,7 @@ using namespace KCal;
class ArchiveDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0);
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 907603a9..dbee755f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -131,18 +131,18 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
mExtensions.setAutoDelete( true );
- mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) );
- mDateChecker = new DateChecker( TQT_TQOBJECT(this) );
+ mDateNavigator = new DateNavigator( this );
+ mDateChecker = new DateChecker( this );
TQBoxLayout *topLayout = new TQVBoxLayout( this );
#ifndef KORG_NOSPLITTER
// create the main layout frames.
- mPanner = new TQSplitter( Qt::Horizontal, this,
+ mPanner = new TQSplitter( TQt::Horizontal, this,
"CalendarView::Panner" );
topLayout->addWidget( mPanner );
- mLeftSplitter = new TQSplitter( Qt::Vertical, mPanner,
+ mLeftSplitter = new TQSplitter( TQt::Vertical, mPanner,
"CalendarView::LeftFrame" );
// mPanner->setResizeMode( mLeftSplitter, TQSplitter::Stretch );
@@ -200,64 +200,64 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
#endif
// Signals emited by mDateNavigator
- connect( mDateNavigator, TQT_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ),
- TQT_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) );
+ connect( mDateNavigator, TQ_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ),
+ TQ_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) );
// Signals emited by mNavigatorBar
- connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousYear() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ),
- mDateNavigator, TQT_SLOT( selectNextYear() ) );
- connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousMonth() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ),
- mDateNavigator, TQT_SLOT( selectNextMonth() ) );
- connect( mNavigatorBar, TQT_SIGNAL( monthSelected(int) ),
- mDateNavigator, TQT_SLOT( selectMonth(int) ) );
- connect( mNavigatorBar, TQT_SIGNAL( yearSelected(int)),
- mDateNavigator, TQT_SLOT(selectYear(int)) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousYear() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextYear() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousMonth() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextMonth() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( monthSelected(int) ),
+ mDateNavigator, TQ_SLOT( selectMonth(int) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( yearSelected(int)),
+ mDateNavigator, TQ_SLOT(selectYear(int)) );
// Signals emited by mDateNavigatorContainer
- connect( mDateNavigatorContainer, TQT_SIGNAL( weekClicked( const TQDate & ) ),
- this, TQT_SLOT( selectWeek( const TQDate & ) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
- mDateNavigator, TQT_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
- mDateNavigator, TQT_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( prevYearClicked() ),
- mDateNavigator, TQT_SLOT( selectPreviousYear() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( nextYearClicked() ),
- mDateNavigator, TQT_SLOT( selectNextYear() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( monthSelected(int) ),
- mDateNavigator, TQT_SLOT( selectMonth(int) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL(yearSelected(int)),
- mDateNavigator, TQT_SLOT(selectYear(int)) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( goPrevious() ),
- mDateNavigator, TQT_SLOT( selectPrevious() ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL( goNext() ),
- mDateNavigator, TQT_SLOT( selectNext() ) );
-
- connect( mDateNavigatorContainer, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ),
- mDateNavigator, TQT_SLOT( selectDates( const KCal::DateList & ) ) );
-
- connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDropped(Incidence*, const TQDate&)),
- TQT_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) );
- connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)),
- TQT_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) );
-
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- mTodoList, TQT_SLOT( dayPassed( const TQDate & ) ) );
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- TQT_SIGNAL( dayPassed( const TQDate & ) ) );
- connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- mDateNavigatorContainer, TQT_SLOT( updateToday() ) );
-
- connect( this, TQT_SIGNAL( configChanged() ),
- mDateNavigatorContainer, TQT_SLOT( updateConfig() ) );
-
- connect( this, TQT_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ),
- mEventViewer, TQT_SLOT ( setIncidence (Incidence *, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( weekClicked( const TQDate & ) ),
+ this, TQ_SLOT( selectWeek( const TQDate & ) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
+ mDateNavigator, TQ_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ),
+ mDateNavigator, TQ_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( prevYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectPreviousYear() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( nextYearClicked() ),
+ mDateNavigator, TQ_SLOT( selectNextYear() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( monthSelected(int) ),
+ mDateNavigator, TQ_SLOT( selectMonth(int) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL(yearSelected(int)),
+ mDateNavigator, TQ_SLOT(selectYear(int)) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( goPrevious() ),
+ mDateNavigator, TQ_SLOT( selectPrevious() ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL( goNext() ),
+ mDateNavigator, TQ_SLOT( selectNext() ) );
+
+ connect( mDateNavigatorContainer, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ),
+ mDateNavigator, TQ_SLOT( selectDates( const KCal::DateList & ) ) );
+
+ connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDropped(Incidence*, const TQDate&)),
+ TQ_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) );
+ connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)),
+ TQ_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) );
+
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ mTodoList, TQ_SLOT( dayPassed( const TQDate & ) ) );
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ TQ_SIGNAL( dayPassed( const TQDate & ) ) );
+ connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ mDateNavigatorContainer, TQ_SLOT( updateToday() ) );
+
+ connect( this, TQ_SIGNAL( configChanged() ),
+ mDateNavigatorContainer, TQ_SLOT( updateConfig() ) );
+
+ connect( this, TQ_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ),
+ mEventViewer, TQ_SLOT ( setIncidence (Incidence *, const TQDate &) ) );
//TODO: do a pretty Summary,
TQString s;
@@ -277,13 +277,13 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
KOGlobals::self()->
setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) );
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
- TQT_SLOT( checkClipboard() ) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+ TQ_SLOT( checkClipboard() ) );
- connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) );
- disconnect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- this, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
+ connect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ TQ_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) );
+ disconnect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ this, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
kdDebug(5850) << "CalendarView::CalendarView() done" << endl;
}
@@ -307,11 +307,11 @@ void CalendarView::setCalendar( Calendar *cal )
delete mHistory;
mHistory = new History( mCalendar );
- connect( mHistory, TQT_SIGNAL( undone() ), TQT_SLOT( updateView() ) );
- connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) );
+ connect( mHistory, TQ_SIGNAL( undone() ), TQ_SLOT( updateView() ) );
+ connect( mHistory, TQ_SIGNAL( redone() ), TQ_SLOT( updateView() ) );
if ( mChanger ) delete mChanger;
- setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) );
+ setIncidenceChanger( new IncidenceChanger( mCalendar, this ) );
mCalendar->registerObserver( this );
@@ -326,21 +326,21 @@ void CalendarView::setIncidenceChanger( IncidenceChangerBase *changer )
{
mChanger = changer;
emit newIncidenceChanger( mChanger );
- connect( mChanger, TQT_SIGNAL( incidenceAdded( Incidence* ) ),
- this, TQT_SLOT( incidenceAdded( Incidence* ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
- this, TQT_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceToBeDeleted( Incidence * ) ),
- this, TQT_SLOT( incidenceToBeDeleted( Incidence * ) ) );
- connect( mChanger, TQT_SIGNAL( incidenceDeleted( Incidence * ) ),
- this, TQT_SLOT( incidenceDeleted( Incidence * ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceAdded( Incidence* ) ),
+ this, TQ_SLOT( incidenceAdded( Incidence* ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
+ this, TQ_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceToBeDeleted( Incidence * ) ),
+ this, TQ_SLOT( incidenceToBeDeleted( Incidence * ) ) );
+ connect( mChanger, TQ_SIGNAL( incidenceDeleted( Incidence * ) ),
+ this, TQ_SLOT( incidenceDeleted( Incidence * ) ) );
- connect( mChanger, TQT_SIGNAL( schedule( Scheduler::Method, Incidence*) ),
- this, TQT_SLOT( schedule( Scheduler::Method, Incidence*) ) );
+ connect( mChanger, TQ_SIGNAL( schedule( Scheduler::Method, Incidence*) ),
+ this, TQ_SLOT( schedule( Scheduler::Method, Incidence*) ) );
- connect( this, TQT_SIGNAL( cancelAttendees( Incidence * ) ),
- mChanger, TQT_SLOT( cancelAttendees( Incidence * ) ) );
+ connect( this, TQ_SIGNAL( cancelAttendees( Incidence * ) ),
+ mChanger, TQ_SLOT( cancelAttendees( Incidence * ) ) );
}
Calendar *CalendarView::calendar()
@@ -357,7 +357,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
cV = mViewManager->multiAgendaView()->selectedAgendaView();
}
if ( cV ) {
- p = tqMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
+ p = qMakePair( cV->resourceCalendar(), cV->subResourceCalendar() );
}
return p;
}
@@ -1776,7 +1776,7 @@ void CalendarView::print()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, mCalendar, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
KOrg::BaseView *currentView = mViewManager->currentView();
@@ -1802,8 +1802,8 @@ void CalendarView::exportWeb()
// seem to load the config theirselves
if ( settings ) settings->readConfig();
ExportWebDialog *dlg = new ExportWebDialog( settings, this );
- connect( dlg, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ),
- this, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ) );
+ connect( dlg, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ),
+ this, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ) );
dlg->show();
}
@@ -2472,8 +2472,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
void CalendarView::connectIncidenceEditor( KOIncidenceEditor *editor )
{
- connect( this, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- editor, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) );
+ connect( this, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ editor, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) );
editor->setIncidenceChanger( mChanger );
}
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 469eddaf..3d1d7623 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -31,7 +31,7 @@
#include <tdefile.h>
#include <korganizer/koeventviewer.h>
#include <libkcal/scheduler.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include "koglobals.h"
#include "interfaces/korganizer/calendarviewbase.h"
@@ -80,7 +80,7 @@ class CalendarViewExtension : public TQWidget
*/
class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index 2be3d060..ebe73465 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -55,8 +55,8 @@ void DateChecker::enableRollover( RolloverType r )
case FollowMonth:
if ( !mUpdateTimer ) {
mUpdateTimer = new TQTimer( this, "mUpdateTimer" );
- connect( mUpdateTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( possiblyPastMidnight() ) );
+ connect( mUpdateTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( possiblyPastMidnight() ) );
}
mUpdateTimer->start( 0, true );
mLastDayChecked = TQDate::currentDate();
diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h
index a2d191a3..5665f26d 100644
--- a/korganizer/datechecker.h
+++ b/korganizer/datechecker.h
@@ -36,7 +36,7 @@ class NavigatorBar;
class DateChecker: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateChecker( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 4418745d..f34c1b28 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -35,7 +35,7 @@
*/
class DateNavigator : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateNavigator( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index bb965ba2..3ff76fec 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -68,26 +68,26 @@ DateNavigatorContainer::~DateNavigatorContainer()
void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
{
- connect( v, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ),
- TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) );
- connect( v, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
- connect( v, TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
- connect( v, TQT_SIGNAL( weekClicked( const TQDate & ) ),
- TQT_SIGNAL( weekClicked( const TQDate & ) ) );
-
- connect( v, TQT_SIGNAL( goPrevious() ), TQT_SIGNAL( goPrevious() ) );
- connect( v, TQT_SIGNAL( goNext() ), TQT_SIGNAL( goNext() ) );
-
- connect( v, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( v, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) );
-
- connect( v, TQT_SIGNAL( prevMonthClicked() ), this, TQT_SLOT( goPrevMonth() ) );
- connect( v, TQT_SIGNAL( nextMonthClicked() ), this, TQT_SLOT( goNextMonth() ) );
-
- connect( v, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) );
- connect( v, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
+ connect( v, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ),
+ TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) );
+ connect( v, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
+ connect( v, TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
+ connect( v, TQ_SIGNAL( weekClicked( const TQDate & ) ),
+ TQ_SIGNAL( weekClicked( const TQDate & ) ) );
+
+ connect( v, TQ_SIGNAL( goPrevious() ), TQ_SIGNAL( goPrevious() ) );
+ connect( v, TQ_SIGNAL( goNext() ), TQ_SIGNAL( goNext() ) );
+
+ connect( v, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( v, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) );
+
+ connect( v, TQ_SIGNAL( prevMonthClicked() ), this, TQ_SLOT( goPrevMonth() ) );
+ connect( v, TQ_SIGNAL( nextMonthClicked() ), this, TQ_SLOT( goNextMonth() ) );
+
+ connect( v, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) );
+ connect( v, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) );
}
void DateNavigatorContainer::setCalendar( Calendar *cal )
@@ -211,7 +211,7 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * )
kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl;
kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl;
#endif
- TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) );
}
void DateNavigatorContainer::resizeAllContents()
@@ -332,7 +332,7 @@ TQPair<TQDate,TQDate> DateNavigatorContainer::dateLimits( int offset )
TQPair<TQDate,TQDate> firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth );
TQPair<TQDate,TQDate> lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth );
- return tqMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
+ return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second );
}
#include "datenavigatorcontainer.moc"
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 17c983e7..6a4d97ec 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -31,7 +31,7 @@ class KDateNavigator;
class DateNavigatorContainer: public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/dcopcalendar.desktop b/korganizer/dcopcalendar.desktop
index dad55950..68fb454d 100644
--- a/korganizer/dcopcalendar.desktop
+++ b/korganizer/dcopcalendar.desktop
@@ -1,57 +1,5 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=DCOP/Organizer
+
Comment=Organizer with a DCOP interface
-Comment[af]=Organiseerder met 'n DCOP koppelvlak
-Comment[be]=Арганізатар з DCOP інтэрфэйсам
-Comment[bg]=Организатор с поддръжка на интерфейс DCOP
-Comment[br]=Deiziater gant un etrefas DCOP
-Comment[bs]=Organizer sa DCOP interfejsom
-Comment[ca]=Organitzador amb una interfície DCOP
-Comment[cs]=Organizátor s DCOP rozhraním
-Comment[cy]=Trefnydd gyda rhyngwyneb DCOP
-Comment[da]=Organisator med en DCOP-grænseflade
-Comment[de]=Organizer mit DCOP-Schnittstelle
-Comment[el]=Organizer με περιβάλλον χρήσης DCOP
-Comment[en_GB]=Organiser with a DCOP interface
-Comment[eo]=Organizilo kun DCOP-interfaco
-Comment[es]=Organizador con un interfaz DCOP
-Comment[et]=KOrganizer DCOP-liidesega
-Comment[eu]=DCOP interfazedun antolatzailea
-Comment[fa]=سازمان‌دهنده با یک واسط DCOP
-Comment[fi]=Kalenteri DCOP-rajapinnalla
-Comment[fr]=Organiseur avec une interface DCOP
-Comment[fy]=Organizer mei in DCOP-ynterface
-Comment[gl]=Organizador con interface DCOP
-Comment[he]=ארגונים עם ממשק DCOP
-Comment[hi]=डीकॉप इंटरफेस सहित आर्गेनाइज़र
-Comment[hu]=Határidőnapló DCOP-felülettel
-Comment[is]=Skipuleggjari með DCOP viðmóti
-Comment[it]=Organizer con un'interfaccia DCOP
-Comment[ja]=DCOP インターフェースを持つオーガナイザ
-Comment[kk]=DCOP интерфейсті Ұйымдастырғыш
-Comment[km]=កម្មវិធី​រៀបចំ​ដែល​មាន​ចំណុច​ប្រទាក់ DCOP
-Comment[lt]=Tvarkyklė su DCOP sąsaja
-Comment[mk]=Организатор со DCOP-интерфејс
-Comment[ms]=Penyusun dengan antara muka DCOP
-Comment[nb]=Organizer med DCOP-grensesnitt
-Comment[nds]=Mötenkalenner mit DCOP-Koppelsteed
-Comment[ne]=DCOP इन्टरफेसको आयोजक
-Comment[nl]=Organizer met een DCOP-interface
-Comment[nn]=Organisator med eit DCOP-grensesnitt
-Comment[pl]=Organizator z interfejsem DCOP
-Comment[pt]=Organizador com uma interface de DCOP
-Comment[pt_BR]=Organizador com uma interface DCOP
-Comment[ro]=Organizator cu interfaţă DCOP
-Comment[ru]=Органайзер с интерфейсом DCOP
-Comment[sk]=Organizér s DCOP rozhraním
-Comment[sl]=Oragnizator z vmesnikom DCOP
-Comment[sr]=Организатор са DCOP интерфејсом
-Comment[sr@Latn]=Organizator sa DCOP interfejsom
-Comment[sv]=Filofax med DCOP-gränssnitt
-Comment[ta]=DCOP முகப்பு அமைப்பாளர்
-Comment[tg]=Органайзер бо интерфейси DCOP
-Comment[tr]=DCOP arayüzü ile Organizer
-Comment[uk]=Тижневик з інтерфейсом DCOP
-Comment[zh_CN]=具有 DCOP 接口的 PDA
-Comment[zh_TW]=有 DCOP 介面的 Organizer
diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h
index 8fb99ab9..f6b02477 100644
--- a/korganizer/eventarchiver.h
+++ b/korganizer/eventarchiver.h
@@ -46,7 +46,7 @@ using namespace KCal;
*/
class EventArchiver : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index 156ed702..a6b09b78 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -81,8 +81,8 @@ ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent
// setupFreeBusyPage();
// setupAdvancedPage();
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotOk() ) );
- connect( this, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( reject() ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotOk() ) );
+ connect( this, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( reject() ) );
readConfig();
updateState();
@@ -149,9 +149,9 @@ void ExportWebDialog::setupGeneralPage()
topLayout->addWidget( typeGroup );
// addWidBool( mSettings->weekViewItem(), typeGroup );
mMonthViewCheckBox = addWidBool( mSettings->monthViewItem(), typeGroup )->checkBox();
- connect( mMonthViewCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) );
+ connect( mMonthViewCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) );
mEventListCheckBox = addWidBool( mSettings->eventViewItem(), typeGroup )->checkBox();
- connect( mEventListCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) );
+ connect( mEventListCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) );
addWidBool( mSettings->todoViewItem(), typeGroup );
// addWidBool( mSettings->journalViewItem(), typeGroup );
// addWidBool( mSettings->freeBusyViewItem(), typeGroup );
@@ -162,8 +162,8 @@ void ExportWebDialog::setupGeneralPage()
topLayout->addWidget(destGroup);
KPrefsWidPath *pathWid = addWidPath( mSettings->outputFileItem(),
destGroup, "text/html", KFile::File );
- connect( pathWid->urlRequester(), TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotTextChanged( const TQString & ) ) );
+ connect( pathWid->urlRequester(), TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotTextChanged( const TQString & ) ) );
topLayout->addStretch( 1 );
}
diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h
index d3f77ff8..79ca87c1 100644
--- a/korganizer/exportwebdialog.h
+++ b/korganizer/exportwebdialog.h
@@ -37,7 +37,7 @@ using namespace KCal;
*/
class ExportWebDialog : public KDialogBase, public KPrefsWidManager
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0,
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index d0f43c94..131b6536 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -234,9 +234,6 @@
<property name="text">
<string>Show all except selected</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="buttonGroupId">
<number>1</number>
</property>
@@ -251,9 +248,6 @@
<property name="text">
<string>Show only selected</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="buttonGroupId">
<number>0</number>
</property>
@@ -268,9 +262,6 @@
<property name="text">
<string>Change...</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</grid>
</widget>
@@ -281,9 +272,6 @@
<property name="text">
<string>Hide to-dos not assigned to me</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="whatsThis" stdset="0">
<string>This option hides all to-dos from your list which are assigned to someone else.&lt;br&gt;
Only to-dos which have least one attendee will be checked. If you are not in the list of attendees the to-do will be hidden.</string>
@@ -309,9 +297,9 @@ Only to-dos which have least one attendee will be checked. If you are not in th
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>updateFilter()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">knuminput.h</include>
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index 74f5a48c..6a2ef703 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -53,11 +53,11 @@ FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters,
{
setMainWidget( mFilterEdit = new FilterEdit(filters, this));
- connect(mFilterEdit, TQT_SIGNAL(dataConsistent(bool)),
- TQT_SLOT(setDialogConsistent(bool)));
+ connect(mFilterEdit, TQ_SIGNAL(dataConsistent(bool)),
+ TQ_SLOT(setDialogConsistent(bool)));
updateFilterList();
- connect( mFilterEdit, TQT_SIGNAL( editCategories() ), TQT_SIGNAL( editCategories() ) );
- connect( mFilterEdit, TQT_SIGNAL( filterChanged() ), TQT_SIGNAL( filterChanged() ) );
+ connect( mFilterEdit, TQ_SIGNAL( editCategories() ), TQ_SIGNAL( editCategories() ) );
+ connect( mFilterEdit, TQ_SIGNAL( filterChanged() ), TQ_SIGNAL( filterChanged() ) );
}
FilterEditDialog::~FilterEditDialog()
@@ -99,11 +99,11 @@ FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent)
TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) );
TQWhatsThis::add( mDeleteButton, i18n( "Press this button to remove the currently active filter." ) );
- connect( mRulesList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(filterSelected()) );
- connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bNewPressed() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bDeletePressed() ) );
- connect( mNameLineEdit, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( updateSelectedName(const TQString &) ) );
- connect( mCatEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCategorySelection() ) );
+ connect( mRulesList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(filterSelected()) );
+ connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bNewPressed() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bDeletePressed() ) );
+ connect( mNameLineEdit, TQ_SIGNAL( textChanged(const TQString &) ), TQ_SLOT( updateSelectedName(const TQString &) ) );
+ connect( mCatEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCategorySelection() ) );
}
FilterEdit::~FilterEdit() {
@@ -231,10 +231,10 @@ void FilterEdit::editCategorySelection()
if ( !mCategorySelectDialog ) {
mCategorySelectDialog = new KPIM::CategorySelectDialog( KOPrefs::instance(), this, "filterCatSelect" );
connect( mCategorySelectDialog,
- TQT_SIGNAL( categoriesSelected( const TQStringList & ) ),
- TQT_SLOT( updateCategorySelection( const TQStringList & ) ) );
- connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ),
- TQT_SIGNAL( editCategories() ) );
+ TQ_SIGNAL( categoriesSelected( const TQStringList & ) ),
+ TQ_SLOT( updateCategorySelection( const TQStringList & ) ) );
+ connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ),
+ TQ_SIGNAL( editCategories() ) );
}
mCategorySelectDialog->setSelected( current->categoryList() );
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index 73a0df8e..3c19d613 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -44,7 +44,7 @@ using namespace KCal;
*/
class FilterEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0);
@@ -69,7 +69,7 @@ class FilterEditDialog : public KDialogBase
class FilterEdit : public FilterEdit_base
{
- Q_OBJECT
+ TQ_OBJECT
public:
FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent);
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 9aa7ed82..8f41a837 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -82,10 +82,10 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
job->setWindow( korg->topLevelWidget() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
TDEIO::Scheduler::scheduleJob( job );
}
@@ -339,8 +339,8 @@ void FreeBusyManager::publishFreeBusy()
KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
job->setWindow( korg->topLevelWidget() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) );
}
}
@@ -406,15 +406,15 @@ bool FreeBusyManager::processRetrieveQueue()
FreeBusyDownloadJob *job = new FreeBusyDownloadJob( email, sourceURL, this,
"freebusy_download_job" );
- connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
+ connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
const TQString & ) ),
- TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) );
- connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
+ TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) );
+ connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *,
const TQString & ) ),
- TQT_SLOT( processRetrieveQueue() ) );
+ TQ_SLOT( processRetrieveQueue() ) );
- connect( job, TQT_SIGNAL( freeBusyDownloadError( const TQString& ) ),
- this, TQT_SLOT( slotFreeBusyDownloadError( const TQString& ) ) );
+ connect( job, TQ_SIGNAL( freeBusyDownloadError( const TQString& ) ),
+ this, TQ_SLOT( slotFreeBusyDownloadError( const TQString& ) ) );
return true;
}
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index 124dbdb3..6650dc4d 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -54,7 +54,7 @@ class FreeBusyManager;
*/
class FreeBusyDownloadJob : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyDownloadJob( const TQString &email, const KURL &url,
@@ -79,7 +79,7 @@ class FreeBusyDownloadJob : public TQObject
class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyManager( TQObject *parent, const char *name );
diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h
index 9447a7f1..a0363ce8 100644
--- a/korganizer/freebusyurldialog.h
+++ b/korganizer/freebusyurldialog.h
@@ -35,7 +35,7 @@ class Attendee;
class FreeBusyUrlDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0,
@@ -50,7 +50,7 @@ class FreeBusyUrlDialog : public KDialogBase
class FreeBusyUrlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0,
diff --git a/korganizer/history.h b/korganizer/history.h
index d0b7e575..db6c5f21 100644
--- a/korganizer/history.h
+++ b/korganizer/history.h
@@ -38,7 +38,7 @@ namespace KOrg {
class History : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
History( KCal::Calendar * );
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index 4272f5da..6edc9f71 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -50,7 +50,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart )
topLayout->addWidget( new TQLabel( txt, topFrame ) );
- TQButtonGroup *radioBox = new TQButtonGroup( 1, Qt::Horizontal, topFrame );
+ TQButtonGroup *radioBox = new TQButtonGroup( 1, TQt::Horizontal, topFrame );
radioBox->setFlat( true );
topLayout->addWidget( radioBox );
diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h
index f6161ea5..c70633b8 100644
--- a/korganizer/importdialog.h
+++ b/korganizer/importdialog.h
@@ -34,7 +34,7 @@ class TQRadioButton;
class ImportDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ImportDialog( const KURL &url, TQWidget *parent, bool isPart );
diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h
index ee684e7c..2a5235bf 100644
--- a/korganizer/incidencechanger.h
+++ b/korganizer/incidencechanger.h
@@ -32,7 +32,7 @@ namespace KCal {
class IncidenceChanger : public KOrg::IncidenceChangerBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
IncidenceChanger( Calendar *cal, TQObject *parent )
diff --git a/korganizer/interfaces/calendar/CMakeLists.txt b/korganizer/interfaces/calendar/CMakeLists.txt
index fe5296fe..1e994d72 100644
--- a/korganizer/interfaces/calendar/CMakeLists.txt
+++ b/korganizer/interfaces/calendar/CMakeLists.txt
@@ -13,6 +13,8 @@ install( FILES
plugin.h calendardecoration.h
DESTINATION ${INCLUDE_INSTALL_DIR}/calendar )
-install( FILES
- calendarplugin.desktop calendardecoration.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE calendarplugin.desktop calendardecoration.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR korganizer-desktops
+)
diff --git a/korganizer/interfaces/calendar/calendardecoration.desktop b/korganizer/interfaces/calendar/calendardecoration.desktop
index 95d49836..8390a6b0 100644
--- a/korganizer/interfaces/calendar/calendardecoration.desktop
+++ b/korganizer/interfaces/calendar/calendardecoration.desktop
@@ -1,65 +1,5 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=Calendar/Decoration
+
Comment=Calendar Decoration Plugin
-Comment[af]=Kalender Versiering Inplak
-Comment[bg]=Приставка за декорация на календара
-Comment[br]=Lugent kinkladur an deiziadur
-Comment[bs]=Dodatak za ukrašavanje kalendara
-Comment[ca]=Endollable de decoració del calendari
-Comment[cs]=Modul dekorace kalendáře
-Comment[cy]=Ategyn Addurniad Calendr
-Comment[da]=Calendar-dekorations-plugin
-Comment[de]=Dekoration für den Kalender
-Comment[el]=Πρόσθετο διακόσμησης ημερολογίου
-Comment[eo]=Kalendarornama kromaĵo
-Comment[es]=Plugin de decoración de calendario
-Comment[et]=Kalendri dekoratsiooni plugin
-Comment[eu]=Egutegi apainketa plugin-a
-Comment[fa]=وصلۀ تزئین تقویم
-Comment[fi]=Kalenteritekstin koristeluliitännäinen
-Comment[fr]=Module de décoration d'agenda
-Comment[fy]=Agindadekoraasjeplugin
-Comment[gl]=Extensión para a Decoración do Calendario
-Comment[he]=תוסף קישוטי לוח שנה
-Comment[hi]=कैलेन्डर सजावट प्लगइन
-Comment[hr]=Dodatak za dekoraciju kalendara
-Comment[hu]=Naptármegjelenési bővítőmodul
-Comment[is]=Íforrit til að skreyta texta dagatals
-Comment[it]=Plugin di decorazione del calendario
-Comment[ja]=カレンダー装飾プラグイン
-Comment[kk]=Күнтізбені безендіру модулі
-Comment[km]=កម្មវិធី​ជំនួយ​សម្រាប់​តុបតែង​ប្រតិទិន
-Comment[lt]=vCalendar dekoracijų priedas
-Comment[lv]=Kalendāra Dekorāciju Iespraudnis
-Comment[mk]=Приклучок за декорација на календар
-Comment[ms]=Plugin Hiasan Kalendar
-Comment[mt]=Plagin ta' dekorazzjoni tal-kalendarju
-Comment[nb]=Calendar dekorasjonsprogramtillegg
-Comment[nds]=Dekoratschoon för den Kalenner
-Comment[ne]=क्यालेन्डर सजावट प्लगइन
-Comment[nl]=Agendadecoratieplugin
-Comment[nn]=Tilleggsmodul for kalenderpynt
-Comment[nso]=Plugin ya Kgabiso ya Tshupamabaka
-Comment[pl]=Wtyczka do dekoracji kalendarza
-Comment[pt]='Plugin' de Decoração do Calendário
-Comment[pt_BR]=Plug-in para Decoração do Calendário
-Comment[ro]=Modul decorare calendar
-Comment[ru]=Оформление календаря
-Comment[se]=Kaleandarčiŋaid lassemoduvla
-Comment[sk]=Modul pre skrášlenie kalendára
-Comment[sl]=Vstavek besedilnega okrasa za Koledar
-Comment[sr]=Прикључак за декорацију календара
-Comment[sr@Latn]=Priključak za dekoraciju kalendara
-Comment[sv]=Insticksprogram för kalenderdekoration
-Comment[ta]=நாள்காட்டி அலங்கார சொருகுப்பொருள்
-Comment[tg]=Модул барои ороиш додани тақвимот
-Comment[th]=โปรแกรมเสริมตกแต่งบันทึกประจำวัน
-Comment[tr]=Takvim Dekorasyon Eklentisi
-Comment[uk]=Втулок прикрас календаря
-Comment[ven]=Pulagini yo khavhisiwaho ya khalenda
-Comment[vi]=Plugin phối trí lịch
-Comment[xh]=Ikhalenda Yohombiso lwe Plugin
-Comment[zh_CN]=日历装饰插件
-Comment[zh_TW]=行事曆文字裝飾外掛程式
-Comment[zu]=Ikhalenda Yeplagi Yokuhlobisa
diff --git a/korganizer/interfaces/calendar/calendarplugin.desktop b/korganizer/interfaces/calendar/calendarplugin.desktop
index 21055f7a..25224bba 100644
--- a/korganizer/interfaces/calendar/calendarplugin.desktop
+++ b/korganizer/interfaces/calendar/calendarplugin.desktop
@@ -1,72 +1,8 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=Calendar/Plugin
+
Comment=Calendar Plugin
-Comment[af]=Kalender Inplak
-Comment[az]=Təqvim Əlavəsi
-Comment[be]=Дапаўненне "Календар"
-Comment[bg]=Приставка за календар
-Comment[br]=Lugent an deiziadur
-Comment[bs]=Dodatak za kalendar
-Comment[ca]=Endollable calendari
-Comment[cs]=Kalendářový modul
-Comment[cy]=Ategyn Calendr
-Comment[da]=Calendar-plugin
-Comment[de]=Kalender-Modul
-Comment[el]=Πρόσθετο ημερολογίου
-Comment[eo]=Kalendaro-kromaĵo
-Comment[es]=Plugin de calendario
-Comment[et]=Kalendriplugin
-Comment[eu]=Egutegi plugin-a
-Comment[fa]=وصلۀ تقویم
-Comment[fi]=Kalenteriliitännäinen
-Comment[fr]=Module d'agenda
-Comment[fy]=Agindaplugin
-Comment[gl]=Extensión de Calendario
-Comment[he]=תוסף לוח שנה
-Comment[hi]=कैलेन्डर प्लगइन
-Comment[hr]=Kalendar dodatak
-Comment[hu]=Naptárkezelő bővítőmodul
-Comment[is]=Dagatals íforrit
-Comment[it]=Plugin calendario
-Comment[ja]=カレンダープラグイン
-Comment[kk]=Күнтізбе модулі
-Comment[km]=កម្មវិធី​ជំនួយ​ប្រតិទិន
-Comment[ko]=달력 플러그인
-Comment[lt]=iCalendar priedas
-Comment[lv]=Kalendāra Iespraudnis
-Comment[mk]=Приклучок за календар
-Comment[ms]=Plugin Kalendar
-Comment[mt]=Plagin tal-kalendarju
-Comment[nb]=Calendar-programtillegg
-Comment[nds]=Kalenner-Moduul
-Comment[ne]=क्यालेन्डर प्लगइन
-Comment[nl]=Agendaplugin
-Comment[nn]=Kalendermodul
-Comment[nso]=Plugin ya Tshupamabaka
-Comment[pl]=Wtyczka do kalendarza
-Comment[pt]='Plugin' de Calendário
-Comment[pt_BR]=Plug-in de Calendário
-Comment[ro]=Modul calendar
-Comment[ru]=Модуль календаря
-Comment[se]=Kaleandarlassemoduvla
-Comment[sk]=Modul Calendar
-Comment[sl]=Vstavek za Koledar
-Comment[sr]=Прикључак за календар
-Comment[sr@Latn]=Priključak za kalendar
-Comment[sv]=Insticksprogram för kalender
-Comment[ta]=நாள்காட்டி சொருகுப்பொருள்
-Comment[tg]=Модул барои тақвимот
-Comment[th]=โปรแกรมเสริมบันทึกประจำวัน
-Comment[tr]=Takvim Eklentisi
-Comment[uk]=Втулок календаря
-Comment[uz]=Календар плагини
-Comment[ven]=U pulaga ha khalenda
-Comment[vi]=Plugin lịch
-Comment[xh]=Ikhalenda ye Plugin
-Comment[zh_CN]=日历插件
-Comment[zh_TW]=行事曆外掛程式
-Comment[zu]=Iplagi Yekhalanda
[PropertyDef::X-TDE-KOrganizer-HasSettings]
Type=bool
diff --git a/korganizer/interfaces/korganizer/CMakeLists.txt b/korganizer/interfaces/korganizer/CMakeLists.txt
index 6b5a45f2..1909d0a1 100644
--- a/korganizer/interfaces/korganizer/CMakeLists.txt
+++ b/korganizer/interfaces/korganizer/CMakeLists.txt
@@ -13,6 +13,8 @@ install( FILES
part.h baseview.h calendarviewbase.h mainwindow.h corehelper.h printplugin.h
DESTINATION ${INCLUDE_INSTALL_DIR}/korganizer )
-install( FILES
- korganizerpart.desktop korgprintplugin.desktop
- DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE korganizerpart.desktop korgprintplugin.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+ PO_DIR korganizer-desktops
+)
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index a8ca0c58..ce3e2145 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -29,7 +29,7 @@
#include <tdelocale.h>
#include <kdebug.h>
#include <tdemessagebox.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include "korganizer/incidencechangerbase.h"
#include "printplugin.h"
@@ -58,7 +58,7 @@ namespace KOrg {
*/
class KDE_EXPORT BaseView : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h
index ba26ce02..730e2936 100644
--- a/korganizer/interfaces/korganizer/incidencechangerbase.h
+++ b/korganizer/interfaces/korganizer/incidencechangerbase.h
@@ -38,7 +38,7 @@ namespace KOrg {
class IncidenceChangerBase : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) :
diff --git a/korganizer/interfaces/korganizer/korganizerpart.desktop b/korganizer/interfaces/korganizer/korganizerpart.desktop
index dda4476b..c840eb56 100644
--- a/korganizer/interfaces/korganizer/korganizerpart.desktop
+++ b/korganizer/interfaces/korganizer/korganizerpart.desktop
@@ -1,62 +1,8 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=KOrganizer/Part
+
Comment=KOrganizer Part
-Comment[af]=Korganizer Deel
-Comment[be]=Частка "K Арганізатар"
-Comment[bg]=Модул KOrganizer
-Comment[br]=Perzh KOrganizer
-Comment[bs]=KOrganizer dio
-Comment[ca]=Part de KOrganizer
-Comment[cy]=KTrefnydd Part
-Comment[da]=KOrganizer-del
-Comment[de]=KOrganizer-Komponente
-Comment[eo]=Organizilo-parto
-Comment[es]=Parte de KOrganizer
-Comment[et]=KOrganizeri komponent
-Comment[eu]=KOrganizer zatia
-Comment[fa]=بخش KOrganizer
-Comment[fr]=Composant KOrganizer
-Comment[gl]=Parte de KOrganizer
-Comment[he]=רכיב KOrganizer
-Comment[hi]=के-आर्गेनाइज़र हिस्सा
-Comment[hr]=KOrganizer komponenta
-Comment[hu]=KOrganizer objektum
-Comment[is]=KOrganizer hluti
-Comment[it]=Parte di KOrganizer
-Comment[ja]=KOrganizer パート
-Comment[kk]=KOrganizer бөлшегі
-Comment[km]=ផ្នែក​របស់ KOrganizer
-Comment[lt]=KOrganizer dalis
-Comment[lv]=KOrganizer Daļa
-Comment[mk]=Дел од КОрганизатор
-Comment[ms]=Bahagian KOrganizer
-Comment[mt]=Parti ta' KOrganizer
-Comment[nb]=KOrganizerdel
-Comment[nds]=KOrganizer-Komponent
-Comment[ne]=केडीई आयोजक भाग
-Comment[nn]=KOrganizer-del
-Comment[nso]=Seripa sa KMokopanyi
-Comment[pl]=Moduł KOrganizera
-Comment[pt]=Componente do KOrganizer
-Comment[pt_BR]=Componente do KOrganizer
-Comment[ro]=Componentă KOrganizer
-Comment[ru]=Компонент органайзера
-Comment[se]=KOrganizer-oassi
-Comment[sk]=Part KOrganizer
-Comment[sl]=Del KOrganizerja
-Comment[sr]=Део KOrganizer-а
-Comment[sr@Latn]=Deo KOrganizer-a
-Comment[sv]=Korganizer-del
-Comment[ta]=கேஅமைப்பாளர் பகுதி
-Comment[tg]=Қисмати органайзер
-Comment[tr]=KOrganizer Parçası
-Comment[uk]=Складова KOrganizer
-Comment[ven]=Tshipida tsha mudzudzanyi wa K
-Comment[xh]=Indawana yeKOrganizer
-Comment[zh_CN]=KOrganizer 部件
-Comment[zh_TW]=KOrganizer 組件
-Comment[zu]=KUmgqugquzeleli Wengxenye
[PropertyDef::X-TDE-KOrganizer-HasSettings]
Type=bool
diff --git a/korganizer/interfaces/korganizer/korgprintplugin.desktop b/korganizer/interfaces/korganizer/korgprintplugin.desktop
index 80a2a8a9..8004253c 100644
--- a/korganizer/interfaces/korganizer/korgprintplugin.desktop
+++ b/korganizer/interfaces/korganizer/korgprintplugin.desktop
@@ -1,62 +1,8 @@
[Desktop Entry]
Type=ServiceType
X-TDE-ServiceType=KOrganizer/PrintPlugin
+
Comment=KOrganizer Part
-Comment[af]=Korganizer Deel
-Comment[be]=Частка "K Арганізатар"
-Comment[bg]=Модул KOrganizer
-Comment[br]=Perzh KOrganizer
-Comment[bs]=KOrganizer dio
-Comment[ca]=Part de KOrganizer
-Comment[cy]=KTrefnydd Part
-Comment[da]=KOrganizer-del
-Comment[de]=KOrganizer-Komponente
-Comment[eo]=Organizilo-parto
-Comment[es]=Parte de KOrganizer
-Comment[et]=KOrganizeri komponent
-Comment[eu]=KOrganizer zatia
-Comment[fa]=بخش KOrganizer
-Comment[fr]=Composant KOrganizer
-Comment[gl]=Parte de KOrganizer
-Comment[he]=רכיב KOrganizer
-Comment[hi]=के-आर्गेनाइज़र हिस्सा
-Comment[hr]=KOrganizer komponenta
-Comment[hu]=KOrganizer objektum
-Comment[is]=KOrganizer hluti
-Comment[it]=Parte di KOrganizer
-Comment[ja]=KOrganizer パート
-Comment[kk]=KOrganizer бөлшегі
-Comment[km]=ផ្នែក​របស់ KOrganizer
-Comment[lt]=KOrganizer dalis
-Comment[lv]=KOrganizer Daļa
-Comment[mk]=Дел од КОрганизатор
-Comment[ms]=Bahagian KOrganizer
-Comment[mt]=Parti ta' KOrganizer
-Comment[nb]=KOrganizerdel
-Comment[nds]=KOrganizer-Komponent
-Comment[ne]=केडीई आयोजक भाग
-Comment[nn]=KOrganizer-del
-Comment[nso]=Seripa sa KMokopanyi
-Comment[pl]=Moduł KOrganizera
-Comment[pt]=Componente do KOrganizer
-Comment[pt_BR]=Componente do KOrganizer
-Comment[ro]=Componentă KOrganizer
-Comment[ru]=Компонент органайзера
-Comment[se]=KOrganizer-oassi
-Comment[sk]=Part KOrganizer
-Comment[sl]=Del KOrganizerja
-Comment[sr]=Део KOrganizer-а
-Comment[sr@Latn]=Deo KOrganizer-a
-Comment[sv]=Korganizer-del
-Comment[ta]=கேஅமைப்பாளர் பகுதி
-Comment[tg]=Қисмати органайзер
-Comment[tr]=KOrganizer Parçası
-Comment[uk]=Складова KOrganizer
-Comment[ven]=Tshipida tsha mudzudzanyi wa K
-Comment[xh]=Indawana yeKOrganizer
-Comment[zh_CN]=KOrganizer 部件
-Comment[zh_TW]=KOrganizer 組件
-Comment[zu]=KUmgqugquzeleli Wengxenye
[PropertyDef::X-TDE-KOrganizer-HasSettings]
Type=bool
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 0e723048..cb0b6884 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -39,7 +39,7 @@ class Part : public KParts::Part
typedef TQPtrList<Part> List;
Part( MainWindow *parent, const char *name )
- : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {}
+ : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {}
virtual ~Part() {}
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 0ceec954..08d57be5 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -75,8 +75,8 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
mTitle = new JournalTitleLable( this );
mTitle->setMargin(2);
mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ),
- this, TQT_SLOT( emitNewJournal() ) );
+ connect( mTitle, TQ_SIGNAL( linkClicked( const TQString & ) ),
+ this, TQ_SLOT( emitNewJournal() ) );
}
JournalDateEntry::~JournalDateEntry()
@@ -120,16 +120,16 @@ void JournalDateEntry::addJournal( Journal *j )
entry->setIncidenceChanger( mChanger );
mEntries.insert( j, entry );
- connect( this, TQT_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ),
- entry, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
- connect( this, TQT_SIGNAL( setDateSignal( const TQDate & ) ),
- entry, TQT_SLOT( setDate( const TQDate & ) ) );
- connect( this, TQT_SIGNAL( flushEntries() ),
- entry, TQT_SLOT( flushEntry() ) );
- connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ),
- this, TQT_SIGNAL( deleteIncidence( Incidence* ) ) );
- connect( entry, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ),
- this, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) );
+ connect( this, TQ_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ),
+ entry, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
+ connect( this, TQ_SIGNAL( setDateSignal( const TQDate & ) ),
+ entry, TQ_SLOT( setDate( const TQDate & ) ) );
+ connect( this, TQ_SIGNAL( flushEntries() ),
+ entry, TQ_SLOT( flushEntry() ) );
+ connect( entry, TQ_SIGNAL( deleteIncidence( Incidence* ) ),
+ this, TQ_SIGNAL( deleteIncidence( Incidence* ) ) );
+ connect( entry, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ),
+ this, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) );
}
Journal::List JournalDateEntry::journals() const
@@ -203,8 +203,8 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
mLayout->addWidget( mTimeCheck, 0, 2 );
mTimeEdit = new KTimeEdit( this );
mLayout->addWidget( mTimeEdit, 0, 3 );
- connect( mTimeCheck, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(timeCheckBoxToggled(bool)) );
+ connect( mTimeCheck, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(timeCheckBoxToggled(bool)) );
TQWhatsThis::add( mTimeCheck, i18n("Determines whether this journal entry has "
"a time associated with it") );
TQWhatsThis::add( mTimeEdit, i18n( "Sets the time associated with this journal "
@@ -217,7 +217,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") );
TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") );
mLayout->addWidget( mDeleteButton, 0, 4 );
- connect( mDeleteButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(deleteItem()) );
+ connect( mDeleteButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(deleteItem()) );
mEditButton = new TQToolButton( this, "editButton" );
mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) );
@@ -225,7 +225,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mEditButton, i18n("Edit this journal entry") );
TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") );
mLayout->addWidget( mEditButton, 0, 5 );
- connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editItem() ) );
+ connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editItem() ) );
#ifndef KORG_NOPRINTER
mPrintButton = new TQToolButton( this, "printButton" );
@@ -234,15 +234,15 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
mLayout->addWidget( mPrintButton, 0, 6 );
- connect( mPrintButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( printItem() ) );
+ connect( mPrintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( printItem() ) );
#endif
mEditor = new KTextEdit(this);
mLayout->addMultiCellWidget( mEditor, 1, 2, 0, 6 );
- connect( mTitleEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setDirty()) );
- connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDirty()) );
- connect( mTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), TQT_SLOT(setDirty()) );
- connect( mEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(setDirty()) );
+ connect( mTitleEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setDirty()) );
+ connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDirty()) );
+ connect( mTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), TQ_SLOT(setDirty()) );
+ connect( mEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(setDirty()) );
mEditor->installEventFilter(this);
@@ -283,7 +283,7 @@ void JournalEntry::printItem()
if ( mJournal ) {
KOCoreHelper helper;
CalPrinter printer( this, 0, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mJournal );
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index f74ab848..9988dbaf 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -48,7 +48,7 @@ namespace KCal {
using namespace KCal;
class JournalEntry : public TQWidget {
- Q_OBJECT
+ TQ_OBJECT
public:
typedef ListBase<JournalEntry> List;
@@ -113,7 +113,7 @@ class JournalEntry : public TQWidget {
class JournalDateEntry : public TQVBox {
- Q_OBJECT
+ TQ_OBJECT
public:
typedef ListBase<JournalDateEntry> List;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 230c992d..94f74a66 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -53,12 +53,12 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
mNavigatorBar = new NavigatorBar( this );
topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 );
- connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), TQT_SIGNAL( prevMonthClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), TQT_SIGNAL( nextMonthClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( mNavigatorBar, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) );
- connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), TQ_SIGNAL( prevMonthClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), TQ_SIGNAL( nextMonthClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( mNavigatorBar, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) );
+ connect( mNavigatorBar, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) );
int i;
TQString generalFont = TDEGlobalSettings::generalFont().family();
@@ -84,13 +84,13 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
mDayMatrix = new KODayMatrix( this, "KDateNavigator::dayMatrix" );
- connect( mDayMatrix, TQT_SIGNAL( selected( const KCal::DateList & ) ),
- TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( selected( const KCal::DateList & ) ),
+ TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) );
- connect( mDayMatrix, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
- TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
- connect( mDayMatrix, TQT_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ),
- TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ),
+ TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) );
+ connect( mDayMatrix, TQ_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ),
+ TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) );
topLayout->addMultiCellWidget( mDayMatrix, 2, 7, 1, 7 );
@@ -288,7 +288,7 @@ bool KDateNavigator::eventFilter( TQObject *o, TQEvent *e )
if ( e->type() == TQEvent::MouseButtonPress ) {
int i;
for( i = 0; i < 6; ++i ) {
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) {
+ if ( o == mWeeknos[ i ] ) {
TQDate weekstart = mDayMatrix->getDate( i * 7 );
emit weekClicked( weekstart );
break;
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 11395138..8da31b02 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -44,7 +44,7 @@ class KODayMatrix;
class KDateNavigator: public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDateNavigator( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b242c306..b7a0e1de 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
setMargin(0);
setBackgroundColor(TQt::red);
minutes = new TQTimer(this);
- connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation()));
+ connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation()));
minutes->start(0, true);
mTimeBox = new TQLabel(this);
@@ -255,10 +255,10 @@ void KOAgenda::init()
// Grab key strokes for keyboard navigation of agenda. Seems to have no
// effect. Has to be fixed.
- setFocusPolicy( TQ_WheelFocus );
+ setFocusPolicy( TQWidget::WheelFocus );
- connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) );
- connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) );
+ connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) );
+ connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) );
mStartCell = TQPoint( 0, 0 );
mEndCell = TQPoint( 0, 0 );
@@ -274,7 +274,7 @@ void KOAgenda::init()
mClickedItem = 0;
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
@@ -291,7 +291,7 @@ void KOAgenda::init()
viewport()->update();
viewport()->setBackgroundMode( NoBackground );
- viewport()->setFocusPolicy( TQ_WheelFocus );
+ viewport()->setFocusPolicy( TQWidget::WheelFocus );
setMinimumSize( 30, int( mGridSpacingY + 1 ) );
// setMaximumHeight(mGridSpacingY * mRows + 5);
@@ -305,8 +305,8 @@ void KOAgenda::init()
calculateWorkingHours();
- connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ),
- TQT_SLOT( checkScrollBoundaries( int ) ) );
+ connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ),
+ TQ_SLOT( checkScrollBoundaries( int ) ) );
// Create the Marcus Bains line.
if( mAllDayMode ) {
@@ -384,19 +384,19 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
case TQEvent::MouseButtonDblClick:
case TQEvent::MouseButtonRelease:
case TQEvent::MouseMove:
- return eventFilter_mouse( object, TQT_TQMOUSEEVENT( event ) );
+ return eventFilter_mouse( object, static_cast<TQMouseEvent*>( event ) );
#ifndef TQT_NO_WHEELEVENT
case TQEvent::Wheel:
- return eventFilter_wheel( object, TQT_TQWHEELEVENT( event ) );
+ return eventFilter_wheel( object, static_cast<TQWheelEvent*>( event ) );
#endif
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
- return eventFilter_key( object, TQT_TQKEYEVENT( event ) );
+ return eventFilter_key( object, static_cast<TQKeyEvent*>( event ) );
case ( TQEvent::Leave ):
if ( !mActionItem )
setCursor( arrowCursor );
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) )
+ if ( object == viewport() )
emit leaveAgenda();
return true;
@@ -422,8 +422,8 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
{
#ifndef KORG_NODND
TQPoint viewportPos;
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) {
- viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() );
+ if ( object != viewport() && object != this ) {
+ viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() );
} else {
viewportPos = de->pos();
}
@@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
// FIXME: This is a bad hack, as the viewportToContents seems to be off by
// 2000 (which is the left upper corner of the viewport). It works correctly
// for agendaItems.
- if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) {
+ if ( object == this ) {
pos = viewportPos + TQPoint( contentsX(), contentsY() );
} else {
pos = viewportToContents( viewportPos );
@@ -526,10 +526,10 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke )
case Key_Alt:
break;
default:
- mTypeAheadEvents.append( TQT_TQEVENT( new TQKeyEvent( ke->type(), ke->key(),
+ mTypeAheadEvents.append( new TQKeyEvent( ke->type(), ke->key(),
ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(),
- ke->count() ) ) );
+ ke->count() ) );
if ( !mTypeAhead ) {
mTypeAhead = true;
emitNewEventForSelection();
@@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
TQPoint viewportPos;
bool accepted=false;
if ( ( e->state() & ShiftButton) == ShiftButton ) {
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
@@ -574,19 +574,19 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
// e->type()<<" delta: "<< e->delta()<< endl;
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Horizontal );
+ TQt::Horizontal );
accepted=true;
}
if ( ( e->state() & ControlButton ) == ControlButton ){
- if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+ if ( object != viewport() ) {
viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() );
} else {
viewportPos = e->pos();
}
emit zoomView( -e->delta() ,
contentsToGrid( viewportToContents( viewportPos ) ),
- Qt::Vertical );
+ TQt::Vertical );
emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos ))));
accepted=true;
}
@@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
{
TQPoint viewportPos;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
viewportPos = ((TQWidget *)object)->mapToParent(me->pos());
} else {
viewportPos = me->pos();
@@ -606,8 +606,8 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
switch (me->type()) {
case TQEvent::MouseButtonPress:
// kdDebug(5850) << "koagenda: filtered button press" << endl;
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
- if (me->button() == Qt::RightButton) {
+ if (object != viewport()) {
+ if (me->button() == TQt::RightButton) {
mClickedItem = dynamic_cast<KOAgendaItem *>(object);
if (mClickedItem) {
selectItem(mClickedItem);
@@ -615,7 +615,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
mClickedItem->incidence(),
mClickedItem->itemDate() );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
} else {
KOAgendaItem* item = dynamic_cast<KOAgendaItem *>(object);
@@ -623,7 +623,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
Incidence *incidence = item->incidence();
if ( incidence->isReadOnly() ) {
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
} else {
mActionItem = item;
mResPair = CalHelper::incSubResourceCalendar( mCalendar, incidence );
@@ -635,11 +635,11 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// null.
selectItem( item );
} else {
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
}
} else {
- if ( me->button() == Qt::RightButton ) {
+ if ( me->button() == TQt::RightButton ) {
// if mouse pointer is not in selection, select the cell below the cursor
TQPoint gpos = contentsToGrid( viewportToContents( viewportPos ) );
if ( !ptInSelection( gpos ) ) {
@@ -657,12 +657,12 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
if ( !ptInSelection( gpos ) ) {
selectItem(0);
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
setCursor(arrowCursor);
startSelectAction(viewportPos);
}
}
- return TQScrollView::eventFilter( TQT_TQOBJECT(object), TQT_TQEVENT(me) ); // pass through for use by multiagenda
+ return TQScrollView::eventFilter( object, me ); // pass through for use by multiagenda
}
break;
@@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
// avoid an offset of a few pixels. Don't ask me why...
TQPoint indicatorPos = gridToContents(contentsToGrid(
viewportToContents( viewportPos )));
- if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+ if (object != viewport()) {
KOAgendaItem *moveItem = dynamic_cast<KOAgendaItem *>(object);
if (moveItem && !moveItem->incidence()->isReadOnly() ) {
if (!mActionItem)
@@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
break; }
case TQEvent::MouseButtonDblClick:
- if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) {
+ if (object == viewport()) {
selectItem(0);
TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
emit newEventSignal( p.first, p.second );
@@ -918,7 +918,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
emit startDragSignal( mActionItem->incidence() );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -952,7 +952,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
placeSubCells( mActionItem );
setCursor( arrowCursor );
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mActionType = NOP;
mItemMoved = false;
return;
@@ -1192,7 +1192,7 @@ void KOAgenda::endItemAction()
}
mActionItem = 0;
- mResPair = tqMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
+ mResPair = qMakePair( static_cast<ResourceCalendar *>( 0 ), TQString() );
mItemMoved = false;
if ( multiModify ) {
@@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) );
if ( YBottom <= YTop ) {
kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl;
@@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd,
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 );
- connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
- connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
- TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ),
+ TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) );
agendaItem->setCellXY( XBegin, 0, 0 );
agendaItem->setCellXRight( XEnd );
@@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item )
}
mItemsToDelete.append( thisItem );
- TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) );
return taken;
}
@@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev )
mGridSpacingY = mDesiredGridSpacingY;
}
calculateWorkingHours();
- TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) );
emit gridSpacingYChanged( mGridSpacingY * 4 );
TQScrollView::resizeEvent(ev);
}
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 05a0af9d..d123f463 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -52,7 +52,7 @@ using namespace KCal;
class MarcusBains : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
MarcusBains( KOAgenda *agenda = 0, const char *name = 0 );
@@ -73,7 +73,7 @@ class MarcusBains : public TQFrame
class KOAgenda : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView,
@@ -198,7 +198,7 @@ class KOAgenda : public TQScrollView
void droppedToDo( Todo*todo, const TQPoint &gpos, bool allDay );
void enableAgendaUpdate( bool enable );
- void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation );
+ void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation );
void mousePosSignal(const TQPoint &pos);
void enterAgenda();
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 9ab341ed..eea5f68f 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -74,7 +74,7 @@ struct MultiItemInfo
*/
class KOAgendaItem : public TQWidget, public KOrg::CellItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd,
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 7e68deeb..1bde3dbe 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -284,7 +284,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
// Create agenda splitter
#ifndef KORG_NOSPLITTER
- mSplitterAgenda = new TQSplitter(Qt::Vertical,this);
+ mSplitterAgenda = new TQSplitter(TQt::Vertical,this);
topLayout->addWidget(mSplitterAgenda);
#if KDE_IS_VERSION( 3, 1, 93 )
@@ -315,7 +315,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
mExpandButton->setPixmap( mNotExpandedPixmap );
mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
TQSizePolicy::Fixed ) );
- connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
+ connect( mExpandButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( toggleExpand() ) );
} else {
TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
@@ -373,27 +373,27 @@ KOAgendaView::KOAgendaView( Calendar *cal,
updateTimeBarWidth();
// Scrolling
- connect(mAgenda->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged()));
+ connect(mAgenda->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged()));
connect( mAgenda,
- TQT_SIGNAL( zoomView( const int, const TQPoint & ,const Qt::Orientation ) ),
- TQT_SLOT( zoomView( const int, const TQPoint &, const Qt::Orientation ) ) );
+ TQ_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ),
+ TQ_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) );
- connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(setContentsPos(int)));
+ connect(mTimeLabels->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(setContentsPos(int)));
// Create Events, depends on type of agenda
- connect( mAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
- TQT_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &)));
- connect( mAllDayAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
- TQT_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &)));
+ connect( mAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
+ TQ_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &)));
+ connect( mAllDayAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)),
+ TQ_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &)));
// event indicator update
- connect( mAgenda, TQT_SIGNAL(lowerYChanged(int)),
- TQT_SLOT(updateEventIndicatorTop(int)));
- connect( mAgenda, TQT_SIGNAL(upperYChanged(int)),
- TQT_SLOT(updateEventIndicatorBottom(int)));
+ connect( mAgenda, TQ_SIGNAL(lowerYChanged(int)),
+ TQ_SLOT(updateEventIndicatorTop(int)));
+ connect( mAgenda, TQ_SIGNAL(upperYChanged(int)),
+ TQ_SLOT(updateEventIndicatorBottom(int)));
if ( !readOnly() ) {
connectAgenda( mAgenda, mAgendaPopup, mAllDayAgenda );
@@ -417,53 +417,53 @@ KOAgendaView::~KOAgendaView()
void KOAgendaView::connectAgenda( KOAgenda *agenda, TQPopupMenu *popup,
KOAgenda *otherAgenda )
{
- connect( agenda, TQT_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)),
- popup, TQT_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)),
+ popup, TQ_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(showNewEventPopupSignal()),
- TQT_SLOT(showNewEventPopup()) );
+ connect( agenda, TQ_SIGNAL(showNewEventPopupSignal()),
+ TQ_SLOT(showNewEventPopup()) );
// Create/Show/Edit/Delete Event
- connect( agenda, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
+ connect( agenda, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
- connect( agenda, TQT_SIGNAL(newStartSelectSignal()),
- otherAgenda, TQT_SLOT(clearSelection()) );
- connect( agenda, TQT_SIGNAL(newStartSelectSignal()),
- TQT_SIGNAL(timeSpanSelectionChanged()) );
+ connect( agenda, TQ_SIGNAL(newStartSelectSignal()),
+ otherAgenda, TQ_SLOT(clearSelection()) );
+ connect( agenda, TQ_SIGNAL(newStartSelectSignal()),
+ TQ_SIGNAL(timeSpanSelectionChanged()) );
- connect( agenda, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( agenda, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( agenda, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( agenda, TQT_SIGNAL(startMultiModify(const TQString &)),
- TQT_SIGNAL(startMultiModify(const TQString &)) );
- connect( agenda, TQT_SIGNAL(endMultiModify()),
- TQT_SIGNAL(endMultiModify()) );
+ connect( agenda, TQ_SIGNAL(startMultiModify(const TQString &)),
+ TQ_SIGNAL(startMultiModify(const TQString &)) );
+ connect( agenda, TQ_SIGNAL(endMultiModify()),
+ TQ_SIGNAL(endMultiModify()) );
- connect( agenda, TQT_SIGNAL(itemModified(KOAgendaItem *)),
- TQT_SLOT(updateEventDates(KOAgendaItem *)) );
+ connect( agenda, TQ_SIGNAL(itemModified(KOAgendaItem *)),
+ TQ_SLOT(updateEventDates(KOAgendaItem *)) );
- connect( agenda, TQT_SIGNAL(enableAgendaUpdate(bool)),
- TQT_SLOT(enableAgendaUpdate(bool)) );
+ connect( agenda, TQ_SIGNAL(enableAgendaUpdate(bool)),
+ TQ_SLOT(enableAgendaUpdate(bool)) );
// drag signals
- connect( agenda, TQT_SIGNAL(startDragSignal(Incidence *)),
- TQT_SLOT(startDrag(Incidence *)) );
+ connect( agenda, TQ_SIGNAL(startDragSignal(Incidence *)),
+ TQ_SLOT(startDrag(Incidence *)) );
// synchronize selections
- connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- otherAgenda, TQT_SLOT(deselectItem()) );
- connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
+ connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ otherAgenda, TQ_SLOT(deselectItem()) );
+ connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
// rescheduling of todos by d'n'd
- connect( agenda, TQT_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)),
- TQT_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) );
+ connect( agenda, TQ_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)),
+ TQ_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) );
}
@@ -561,7 +561,7 @@ void KOAgendaView::zoomOutHorizontally( const TQDate &date )
}
void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
- const Qt::Orientation orient )
+ const TQt::Orientation orient )
{
static TQDate zoomDate;
static TQTimer *t = new TQTimer( this );
@@ -569,7 +569,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
//Zoom to the selected incidence, on the other way
// zoom to the date on screen after the first mousewheel move.
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
TQDate date=mAgenda->selectedIncidenceDate();
if ( date.isValid() )
zoomDate=date;
@@ -584,7 +584,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos,
else
zoomInHorizontally( zoomDate );
} else {
- // Qt::Vertical zoom
+ // Vertical zoom
TQPoint posConstentsOld = mAgenda->gridToContents(pos);
if ( delta > 0 ) {
zoomOutVertically();
@@ -682,7 +682,7 @@ void KOAgendaView::createDayLabels( bool force )
if ( !mIsSideBySide )
mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width());
mDayLabels->show();
- TQTimer::singleShot( 0, this, TQT_SLOT( updateDayLabelSizes() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateDayLabelSizes() ) );
}
void KOAgendaView::enableAgendaUpdate( bool enable )
@@ -1117,7 +1117,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item )
if ( !result ) {
mPendingChanges = true;
- TQTimer::singleShot( 0, this, TQT_SLOT(updateView()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(updateView()) );
return;
}
@@ -1131,7 +1131,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item )
// recreated. All others have to!!!
if ( incidence->doesRecur() ) {
mUpdateItem = incidence;
- TQTimer::singleShot( 0, this, TQT_SLOT( doUpdateItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateItem() ) );
}
enableAgendaUpdate( true );
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 887cc957..bbc9c235 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -50,7 +50,7 @@ namespace KOrg {
class EventIndicator : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Location { Top, Bottom };
@@ -74,7 +74,7 @@ class EventIndicator : public TQFrame
class KOAlternateLabel : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel,
@@ -107,7 +107,7 @@ class KOAlternateLabel : public TQLabel
*/
class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAgendaView( Calendar *cal,
@@ -197,7 +197,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
void zoomView( const int delta, const TQPoint &pos,
- const Qt::Orientation orient=Qt::Horizontal );
+ const TQt::Orientation orient=TQt::Horizontal );
void clearTimeSpanSelection();
diff --git a/korganizer/koapp.h b/korganizer/koapp.h
index 782e6994..59ead1a0 100644
--- a/korganizer/koapp.h
+++ b/korganizer/koapp.h
@@ -29,7 +29,7 @@
class KOrganizerApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerApp();
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index d95618c8..5c8ddc39 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -109,9 +109,9 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
mNameEdit->setClickMessage( i18n("Click to add a new attendee") );
attendeeLabel->setBuddy( mNameEdit );
mNameEdit->installEventFilter( this );
- connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( updateAttendee() ) );
- connect( mNameEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(expandAttendee()) );
+ connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( updateAttendee() ) );
+ connect( mNameEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(expandAttendee()) );
topLayout->addMultiCellWidget( mNameEdit, 0, 0, 1, 2 );
whatsThis = i18n("Edits the role of the attendee selected "
@@ -125,8 +125,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
TQWhatsThis::add( mRoleCombo, whatsThis );
mRoleCombo->insertStringList( Attendee::roleList() );
attendeeRoleLabel->setBuddy( mRoleCombo );
- connect( mRoleCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAttendee() ) );
+ connect( mRoleCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mRoleCombo, 1, 1 );
mDelegateLabel = new TQLabel( parent );
@@ -151,8 +151,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) );
statusLabel->setBuddy( mStatusCombo );
- connect( mStatusCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( updateAttendee() ) );
+ connect( mStatusCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mStatusCombo, 2, 1 );
topLayout->setColStretch( 2, 1 );
@@ -163,7 +163,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
"selected in the list above to request "
"a response concerning attendance.") );
mRsvpButton->setText( i18n("Re&quest response") );
- connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) );
+ connect( mRsvpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAttendee() ) );
topLayout->addWidget( mRsvpButton, 2, 2 );
TQWidget *buttonBox = new TQWidget( parent );
@@ -179,7 +179,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
"from your addressbook, click the 'Select Addressee' "
"button instead.") );
buttonLayout->addWidget( mAddButton );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addNewAttendee() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addNewAttendee() ) );
mRemoveButton = new TQPushButton( i18n("&Remove"), buttonBox );
TQWhatsThis::add( mRemoveButton,
@@ -193,7 +193,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
i18n("Opens your address book, allowing you to select "
"new attendees from it.") );
buttonLayout->addWidget( mAddressBookButton );
- connect( mAddressBookButton, TQT_SIGNAL( clicked() ), TQT_SLOT( openAddressBook() ) );
+ connect( mAddressBookButton, TQ_SIGNAL( clicked() ), TQ_SLOT( openAddressBook() ) );
topLayout->addMultiCellWidget( buttonBox, 0, 3, 3, 3 );
@@ -277,7 +277,7 @@ void KOAttendeeEditor::addNewAttendee()
// We don't want the hint again
mNameEdit->setClickMessage( "" );
mNameEdit->setFocus();
- TQTimer::singleShot( 0, mNameEdit, TQT_SLOT( selectAll() ) );
+ TQTimer::singleShot( 0, mNameEdit, TQ_SLOT( selectAll() ) );
}
void KOAttendeeEditor::readEvent(KCal::Incidence * incidence)
@@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe()
bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev)
{
- if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn &&
+ if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn &&
currentAttendee() == 0 ) {
addNewAttendee();
}
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 3454f81d..042419fd 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -46,7 +46,7 @@ namespace KCal {
*/
class KOAttendeeEditor : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAttendeeEditor( TQWidget *parent, const char *name = 0 );
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index d160f68d..f5dd7c97 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
#include <korganizer/part.h>
#include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <ktrader.h>
namespace KPIM { class IdentityManager; }
diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp
index 5341e1d0..dc6a76ea 100644
--- a/korganizer/kocounterdialog.cpp
+++ b/korganizer/kocounterdialog.cpp
@@ -39,8 +39,8 @@ KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const ch
mEventViewer = new KOEventViewer( calendar, this );
setMainWidget( mEventViewer );
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCancel() ) );
- connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotOk( ) ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCancel() ) );
+ connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotOk( ) ) );
// FIXME: Set a sensible size (based on the content?).
setMinimumSize( 300, 200 );
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index 1af7c47c..5be67874 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -38,7 +38,7 @@ class KOEventViewer;
*/
class KOCounterDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 5d95b81e..0a575a77 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -125,9 +125,9 @@ void KODayMatrix::setCalendar( Calendar *cal )
mCalendar->registerObserver( this );
CalendarResources *calres = dynamic_cast<CalendarResources*>( cal );
if ( calres ) {
- connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
- connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
+ connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) );
}
setAcceptDrops( mCalendar );
@@ -725,5 +725,5 @@ TQPair<TQDate,TQDate> KODayMatrix::matrixLimits( const TQDate &month )
d = d.addDays( -7 ); // Start on the second line
}
- return tqMakePair( d, d.addDays( NUMDAYS-1 ) );
+ return qMakePair( d, d.addDays( NUMDAYS-1 ) );
}
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 79231b46..9b3db818 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -104,7 +104,7 @@ class DynamicTip : public TQToolTip
*/
class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** constructor to create a day matrix widget.
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 20ed0259..17bb056c 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -93,8 +93,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) :
// don't set any specific parent for the dialog, as its kept around and reused
// in different cases where it should have different parents
KWin::setMainWindow( mCategoryEditDialog, 0 );
- connect( mainView, TQT_SIGNAL( categoriesChanged() ),
- mCategoryEditDialog, TQT_SLOT( reload() ) );
+ connect( mainView, TQ_SIGNAL( categoriesChanged() ),
+ mCategoryEditDialog, TQ_SLOT( reload() ) );
KOGlobals::fitDialogToScreen( mCategoryEditDialog );
}
@@ -123,20 +123,20 @@ void KODialogManager::showOptionsDialog()
// mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable );
// mOptionsDialog = new TDEConfigureDialog( mMainView );
connect( mOptionsDialog->dialog(),
- TQT_SIGNAL( configCommitted( const TQCString & ) ),
- mMainView, TQT_SLOT( updateConfig() ) );
+ TQ_SIGNAL( configCommitted( const TQCString & ) ),
+ mMainView, TQ_SLOT( updateConfig() ) );
#else
mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" );
- connect( mOptionsDialog, TQT_SIGNAL( configCommitted( const TQCString & ) ),
- mMainView, TQT_SLOT( updateConfig( const TQCString& ) ) );
+ connect( mOptionsDialog, TQ_SIGNAL( configCommitted( const TQCString & ) ),
+ mMainView, TQ_SLOT( updateConfig( const TQCString& ) ) );
#if 0
- connect( mOptionsDialog, TQT_SIGNAL( applyClicked() ),
- mMainView, TQT_SLOT( updateConfig() ) );
- connect( mOptionsDialog, TQT_SIGNAL( okClicked() ),
- mMainView, TQT_SLOT( updateConfig() ) );
+ connect( mOptionsDialog, TQ_SIGNAL( applyClicked() ),
+ mMainView, TQ_SLOT( updateConfig() ) );
+ connect( mOptionsDialog, TQ_SIGNAL( okClicked() ),
+ mMainView, TQ_SLOT( updateConfig() ) );
// @TODO Find a way to do this with KCMultiDialog
- connect(mCategoryEditDialog,TQT_SIGNAL(categoryConfigChanged()),
- mOptionsDialog,TQT_SLOT(updateCategories()));
+ connect(mCategoryEditDialog,TQ_SIGNAL(categoryConfigChanged()),
+ mOptionsDialog,TQ_SLOT(updateCategories()));
#endif
TQStringList modules;
@@ -172,13 +172,13 @@ void KODialogManager::showSearchDialog()
{
if ( !mSearchDialog ) {
mSearchDialog = new SearchDialog( mMainView->calendar(), mMainView );
- connect( mSearchDialog, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) );
- connect( mSearchDialog, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) );
- connect( mSearchDialog, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(deleteIncidence(Incidence *)) );
- connect( mMainView, TQT_SIGNAL(closingDown()),mSearchDialog,TQT_SLOT(reject()) );
+ connect( mSearchDialog, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) );
+ connect( mSearchDialog, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) );
+ connect( mSearchDialog, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(deleteIncidence(Incidence *)) );
+ connect( mMainView, TQ_SIGNAL(closingDown()),mSearchDialog,TQ_SLOT(reject()) );
}
// make sure the widget is on top again
mSearchDialog->show();
@@ -190,10 +190,10 @@ void KODialogManager::showArchiveDialog()
#ifndef KORG_NOARCHIVE
if (!mArchiveDialog) {
mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView);
- connect(mArchiveDialog,TQT_SIGNAL(eventsDeleted()),
- mMainView,TQT_SLOT(updateView()));
- connect(mArchiveDialog,TQT_SIGNAL(autoArchivingSettingsModified()),
- mMainView,TQT_SLOT(slotAutoArchivingSettingsModified()));
+ connect(mArchiveDialog,TQ_SIGNAL(eventsDeleted()),
+ mMainView,TQ_SLOT(updateView()));
+ connect(mArchiveDialog,TQ_SIGNAL(autoArchivingSettingsModified()),
+ mMainView,TQ_SLOT(slotAutoArchivingSettingsModified()));
}
mArchiveDialog->show();
mArchiveDialog->raise();
@@ -207,12 +207,12 @@ void KODialogManager::showFilterEditDialog( TQPtrList<CalFilter> *filters )
{
if ( !mFilterEditDialog ) {
mFilterEditDialog = new FilterEditDialog( filters, mMainView );
- connect( mFilterEditDialog, TQT_SIGNAL( filterChanged() ),
- mMainView, TQT_SLOT( updateFilter() ) );
- connect( mFilterEditDialog, TQT_SIGNAL( editCategories() ),
- mCategoryEditDialog, TQT_SLOT( show() ) );
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- mFilterEditDialog, TQT_SLOT( updateCategoryConfig() ) );
+ connect( mFilterEditDialog, TQ_SIGNAL( filterChanged() ),
+ mMainView, TQ_SLOT( updateFilter() ) );
+ connect( mFilterEditDialog, TQ_SIGNAL( editCategories() ),
+ mCategoryEditDialog, TQ_SLOT( show() ) );
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ mFilterEditDialog, TQ_SLOT( updateCategoryConfig() ) );
}
mFilterEditDialog->show();
mFilterEditDialog->raise();
@@ -241,29 +241,29 @@ void KODialogManager::connectTypeAhead( KOEventEditor *editor,
{
if ( editor && agenda ) {
agenda->setTypeAheadReceiver( editor->typeAheadReceiver() );
- connect( editor, TQT_SIGNAL( focusReceivedSignal() ),
- agenda, TQT_SLOT( finishTypeAhead() ) );
+ connect( editor, TQ_SIGNAL( focusReceivedSignal() ),
+ agenda, TQ_SLOT( finishTypeAhead() ) );
}
}
void KODialogManager::connectEditor( KOIncidenceEditor*editor )
{
- connect( editor, TQT_SIGNAL( deleteIncidenceSignal( Incidence * ) ),
- mMainView, TQT_SLOT( deleteIncidence( Incidence * ) ) );
-
- connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ),
- editor, TQT_SIGNAL( updateCategoryConfig() ) );
- connect( editor, TQT_SIGNAL( editCategories() ),
- mCategoryEditDialog, TQT_SLOT( show() ) );
-
- connect( editor, TQT_SIGNAL( dialogClose( Incidence * ) ),
- mMainView, TQT_SLOT( dialogClosing( Incidence * ) ) );
- connect( editor, TQT_SIGNAL( editCanceled( Incidence * ) ),
- mMainView, TQT_SLOT( editCanceled( Incidence * ) ) );
- connect( mMainView, TQT_SIGNAL( closingDown() ), editor, TQT_SLOT( reject() ) );
-
- connect( editor, TQT_SIGNAL( deleteAttendee( Incidence * ) ),
- mMainView, TQT_SIGNAL( cancelAttendees( Incidence * ) ) );
+ connect( editor, TQ_SIGNAL( deleteIncidenceSignal( Incidence * ) ),
+ mMainView, TQ_SLOT( deleteIncidence( Incidence * ) ) );
+
+ connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ),
+ editor, TQ_SIGNAL( updateCategoryConfig() ) );
+ connect( editor, TQ_SIGNAL( editCategories() ),
+ mCategoryEditDialog, TQ_SLOT( show() ) );
+
+ connect( editor, TQ_SIGNAL( dialogClose( Incidence * ) ),
+ mMainView, TQ_SLOT( dialogClosing( Incidence * ) ) );
+ connect( editor, TQ_SIGNAL( editCanceled( Incidence * ) ),
+ mMainView, TQ_SLOT( editCanceled( Incidence * ) ) );
+ connect( mMainView, TQ_SIGNAL( closingDown() ), editor, TQ_SLOT( reject() ) );
+
+ connect( editor, TQ_SIGNAL( deleteAttendee( Incidence * ) ),
+ mMainView, TQ_SIGNAL( cancelAttendees( Incidence * ) ) );
}
KOTodoEditor *KODialogManager::getTodoEditor()
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index 4fbb7056..64f1b405 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -50,7 +50,7 @@ using namespace KCal;
*/
class KODialogManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KODialogManager( CalendarView * );
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index 1415eef5..e7d1beb9 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -206,25 +206,25 @@ KOEditorAlarms::KOEditorAlarms( const TQCString &type,
mWidget->mAlarmList->setResizeMode( TQListView::LastColumn );
mWidget->mAlarmList->setColumnWidthMode( 0, TQListView::Maximum );
mWidget->mAlarmList->setColumnWidthMode( 1, TQListView::Maximum );
- connect( mWidget->mAlarmList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- TQT_SLOT( selectionChanged( TQListViewItem * ) ) );
- connect( mWidget->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
- connect( mWidget->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
- connect( mWidget->mDuplicateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDuplicate() ) );
-
- connect( mWidget->mAlarmOffset, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mOffsetUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mBeforeAfter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeats, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeatCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mRepeatInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mAlarmType, TQT_SIGNAL(clicked(int)), TQT_SLOT( changed() ) );
- connect( mWidget->mDisplayText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) );
- connect( mWidget->mSoundFile, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mApplication, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mAppArguments, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mEmailAddress, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) );
- connect( mWidget->mEmailText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) );
+ connect( mWidget->mAlarmList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ TQ_SLOT( selectionChanged( TQListViewItem * ) ) );
+ connect( mWidget->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
+ connect( mWidget->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
+ connect( mWidget->mDuplicateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDuplicate() ) );
+
+ connect( mWidget->mAlarmOffset, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mOffsetUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mBeforeAfter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeats, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeatCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mRepeatInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mAlarmType, TQ_SIGNAL(clicked(int)), TQ_SLOT( changed() ) );
+ connect( mWidget->mDisplayText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) );
+ connect( mWidget->mSoundFile, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mApplication, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mAppArguments, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mEmailAddress, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) );
+ connect( mWidget->mEmailText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) );
init();
diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h
index f713fcf9..18855733 100644
--- a/korganizer/koeditoralarms.h
+++ b/korganizer/koeditoralarms.h
@@ -33,7 +33,7 @@ class AlarmListViewItem;
class KOEditorAlarms : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorAlarms( const TQCString &type,
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index a5f89cc1..b7a61b60 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -662,11 +662,9 @@
<includes>
<include location="global" impldecl="in declaration">addresseelineedit.h</include>
<include location="global" impldecl="in declaration">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/addresseelineedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>libtdepim/addresseelineedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 48b9acdd..669fd636 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -189,7 +189,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
i18n( "Type any string you desire here for the name of the attachment" ) );
grid->addMultiCellWidget( mLabelEdit, 0, 0, 1, 2 );
- KSeparator *sep = new KSeparator( Qt::Horizontal, topFrame );
+ KSeparator *sep = new KSeparator( TQt::Horizontal, topFrame );
grid->addMultiCellWidget( sep, 1, 1, 0, 2 );
TQLabel *label = new TQLabel( i18n( "Type:" ), topFrame );
@@ -224,10 +224,10 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
i18n( "Enter the path to the attachment file or use the "
"file browser by pressing the adjacent button" ) );
grid->addMultiCellWidget( mURLRequester, 4, 4, 1, 2 );
- connect( mURLRequester, TQT_SIGNAL(urlSelected(const TQString &)),
- TQT_SLOT(urlSelected(const TQString &)) );
- connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( urlChanged( const TQString& ) ) );
+ connect( mURLRequester, TQ_SIGNAL(urlSelected(const TQString &)),
+ TQ_SLOT(urlSelected(const TQString &)) );
+ connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( urlChanged( const TQString& ) ) );
urlChanged( item->uri() );
} else {
uint size = item->attachment()->size();
@@ -324,8 +324,8 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
setMaxItemWidth( TQMAX(maxItemWidth(), 250) );
setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 );
- connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
- this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) );
+ connect( this, TQ_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+ this, TQ_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) );
}
KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
@@ -462,12 +462,12 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
i18n("Displays a list of current items (files, mail, etc.) "
"that have been associated with this event or to-do. ") );
topLayout->addWidget( mAttachments );
- connect( mAttachments, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ),
- TQT_SLOT( showAttachment( TQIconViewItem * ) ) );
- connect( mAttachments, TQT_SIGNAL(selectionChanged()),
- TQT_SLOT(selectionChanged()) );
- connect( mAttachments, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
- TQT_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) );
+ connect( mAttachments, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ),
+ TQ_SLOT( showAttachment( TQIconViewItem * ) ) );
+ connect( mAttachments, TQ_SIGNAL(selectionChanged()),
+ TQ_SLOT(selectionChanged()) );
+ connect( mAttachments, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),
+ TQ_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) );
TQPushButton *addButton = new TQPushButton( this );
addButton->setIconSet( SmallIconSet( "add" ) );
@@ -477,7 +477,7 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
"to add to this event or to-do as link or as "
"inline data." ) );
topLayout->addWidget( addButton );
- connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()) );
+ connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()) );
mRemoveBtn = new TQPushButton( this );
mRemoveBtn->setIconSet( SmallIconSet( "remove" ) );
@@ -486,33 +486,33 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
i18n("Removes the attachment selected in the list above "
"from this event or to-do.") );
topLayout->addWidget( mRemoveBtn );
- connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) );
+ connect( mRemoveBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()) );
mContextMenu = new TDEPopupMenu( this );
- TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) );
+ TDEActionCollection* ac = new TDEActionCollection( this, this );
- mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac );
+ mOpenAction = new TDEAction( i18n("Open"), 0, this, TQ_SLOT(slotShow()), ac );
mOpenAction->plug( mContextMenu );
- mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac );
+ mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQ_SLOT(slotSaveAs()), ac );
mSaveAsAction->plug( mContextMenu );
mContextMenu->insertSeparator();
- mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
+ mCopyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), ac );
mCopyAction->plug( mContextMenu );
- mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac );
+ mCutAction = KStdAction::cut(this, TQ_SLOT(slotCut()), ac );
mCutAction->plug( mContextMenu );
- TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac );
+ TDEAction *action = KStdAction::paste(this, TQ_SLOT(slotPaste()), ac );
action->plug( mContextMenu );
mContextMenu->insertSeparator();
- mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac );
+ mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQ_SLOT(slotRemove()), ac );
mDeleteAction->plug( mContextMenu );
mDeleteAction->setShortcut( Key_Delete );
mContextMenu->insertSeparator();
- mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac );
+ mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQ_SLOT(slotEdit()), ac );
mEditAction->plug( mContextMenu );
selectionChanged();
@@ -691,7 +691,7 @@ void KOEditorAttachments::slotEdit()
AttachmentEditDialog *dialog = new AttachmentEditDialog( attitem, mAttachments );
dialog->mInline->setEnabled( false );
dialog->setModal( false );
- connect( dialog, TQT_SIGNAL(hidden()), dialog, TQT_SLOT(delayedDestruct()) );
+ connect( dialog, TQ_SIGNAL(hidden()), dialog, TQ_SLOT(delayedDestruct()) );
dialog->show();
}
}
@@ -854,7 +854,7 @@ void KOEditorAttachments::readIncidence( KCal::Incidence *i )
addAttachment( (*it) );
}
if ( mAttachments->count() > 0 ) {
- TQTimer::singleShot( 0, mAttachments, TQT_SLOT(arrangeItemsInGrid()) );
+ TQTimer::singleShot( 0, mAttachments, TQ_SLOT(arrangeItemsInGrid()) );
}
}
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index b89dd0b3..adeded3a 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -56,7 +56,7 @@ class KTempDir;
class AttachmentEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 );
@@ -80,7 +80,7 @@ class AttachmentEditDialog : public KDialogBase
class KOEditorAttachments : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorAttachments( int spacing = 8, TQWidget *parent = 0,
@@ -151,7 +151,7 @@ class KOEditorAttachments : public TQWidget
class AttachmentIconView : public TDEIconView
{
- Q_OBJECT
+ TQ_OBJECT
friend class KOEditorAttachments;
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 95d21176..9d570f16 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -208,17 +208,17 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent,
mListView->setFixedHeight( 78 );
}
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
- TQT_SLOT( updateAttendeeInput() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ TQ_SLOT( updateAttendeeInput() ) );
#ifndef KORG_NODND
- connect( mListView, TQT_SIGNAL( dropped( Attendee * ) ),
- TQT_SLOT( slotInsertAttendee( Attendee * ) ) );
+ connect( mListView, TQ_SIGNAL( dropped( Attendee * ) ),
+ TQ_SLOT( slotInsertAttendee( Attendee * ) ) );
#endif
topLayout->addWidget( mListView );
initEditWidgets( this, topLayout );
- connect( mRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeAttendee()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeAttendee()) );
updateAttendeeInput();
}
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 97fac51c..418c8edb 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -59,7 +59,7 @@ typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem;
*/
class KOAttendeeListView : public TDEListView
{
-Q_OBJECT
+TQ_OBJECT
public:
KOAttendeeListView (TQWidget *parent=0, const char *name=0);
@@ -78,7 +78,7 @@ signals:
class KOEditorDetails : public KOAttendeeEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0);
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index 88c5414b..05db9b5d 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -263,15 +263,15 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
scaleCombo->insertItem( i18n( "Month" ) );
scaleCombo->insertItem( i18n( "Automatic" ) );
scaleCombo->setCurrentItem( 0 ); // start with "hour"
- connect( scaleCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotScaleChanged( int ) ) );
+ connect( scaleCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotScaleChanged( int ) ) );
controlLayout->addWidget( scaleCombo );
TQPushButton *button = new TQPushButton( i18n( "Center on Start" ), this );
TQWhatsThis::add( button,
i18n("Centers the Gantt chart on the start time "
"and day of this event.") );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenterOnStart() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenterOnStart() ) );
controlLayout->addWidget( button );
controlLayout->addStretch( 1 );
@@ -280,7 +280,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
TQWhatsThis::add( button,
i18n("Moves the event to a date and time when all the "
"attendees are free.") );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPickDate() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPickDate() ) );
controlLayout->addWidget( button );
controlLayout->addStretch( 1 );
@@ -290,7 +290,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
i18n("Reloads Free/Busy data for all attendees from "
"the corresponding servers.") );
controlLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( manualReload() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( manualReload() ) );
mGanttView = new KDGanttView( this, "mGanttView" );
TQWhatsThis::add( mGanttView,
@@ -330,37 +330,37 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
mEventRectangle->setColor( TQt::magenta );
mGanttView->addIntervalBackgroundColor( mEventRectangle );
- connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &,
+ connect( mGanttView, TQ_SIGNAL ( timeIntervalSelected( const TQDateTime &,
const TQDateTime & ) ),
- mGanttView, TQT_SLOT( zoomToSelection( const TQDateTime &,
+ mGanttView, TQ_SLOT( zoomToSelection( const TQDateTime &,
const TQDateTime & ) ) );
- connect( mGanttView, TQT_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ),
- TQT_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) );
- connect( mGanttView, TQT_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ),
- this, TQT_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) );
-
- connect( mGanttView, TQT_SIGNAL(lvSelectionChanged(KDGanttViewItem*)),
- this, TQT_SLOT(updateAttendeeInput()) );
- connect( mGanttView, TQT_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)),
- this, TQT_SLOT(showAttendeeStatusMenu()) );
- connect( mGanttView, TQT_SIGNAL(lvItemRightClicked(KDGanttViewItem*)),
- this, TQT_SLOT(showAttendeeStatusMenu()) );
- connect( mGanttView, TQT_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(listViewClicked(int, KDGanttViewItem*)) );
+ connect( mGanttView, TQ_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ),
+ TQ_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) );
+ connect( mGanttView, TQ_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ),
+ this, TQ_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) );
+
+ connect( mGanttView, TQ_SIGNAL(lvSelectionChanged(KDGanttViewItem*)),
+ this, TQ_SLOT(updateAttendeeInput()) );
+ connect( mGanttView, TQ_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)),
+ this, TQ_SLOT(showAttendeeStatusMenu()) );
+ connect( mGanttView, TQ_SIGNAL(lvItemRightClicked(KDGanttViewItem*)),
+ this, TQ_SLOT(showAttendeeStatusMenu()) );
+ connect( mGanttView, TQ_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(listViewClicked(int, KDGanttViewItem*)) );
FreeBusyManager *m = KOGroupware::instance()->freeBusyManager();
- connect( m, TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ),
- TQT_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) );
+ connect( m, TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ),
+ TQ_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) );
- connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoReload() ) );
+ connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoReload() ) );
initEditWidgets( this, topLayout );
- connect( mRemoveButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(removeAttendee()) );
+ connect( mRemoveButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(removeAttendee()) );
slotOrganizerChanged( mOrganizerCombo->currentText() );
- connect( mOrganizerCombo, TQT_SIGNAL( activated(const TQString&) ),
- this, TQT_SLOT( slotOrganizerChanged(const TQString&) ) );
+ connect( mOrganizerCombo, TQ_SIGNAL( activated(const TQString&) ),
+ this, TQ_SLOT( slotOrganizerChanged(const TQString&) ) );
//suppress the buggy consequences of clicks on the time header widget
mGanttView->timeHeaderWidget()->installEventFilter( this );
@@ -923,7 +923,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item)
{
- if ( button == Qt::LeftButton && item == 0 )
+ if ( button == TQt::LeftButton && item == 0 )
addNewAttendee();
}
@@ -983,7 +983,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer)
bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event )
{
- if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) &&
+ if ( watched == mGanttView->timeHeaderWidget() &&
event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) {
return true;
} else {
diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h
index c5201fc2..2af15f44 100644
--- a/korganizer/koeditorfreebusy.h
+++ b/korganizer/koeditorfreebusy.h
@@ -44,7 +44,7 @@ namespace KCal {
class KOEditorFreeBusy : public KOAttendeeEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0,
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 304fea93..c8c70277 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -114,8 +114,8 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
mSummaryEdit = new FocusLineEdit( parent );
TQWhatsThis::add( mSummaryEdit, whatsThis );
- connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ),
- TQT_SIGNAL( focusReceivedSignal() ) );
+ connect( mSummaryEdit, TQ_SIGNAL( focusReceivedSignal() ),
+ TQ_SIGNAL( focusReceivedSignal() ) );
headerLayout->addWidget(mSummaryEdit,1,1);
summaryLabel->setBuddy( mSummaryEdit );
@@ -152,7 +152,7 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout)
mCategoriesButton = new TQPushButton( parent );
mCategoriesButton->setText(i18n("Select..."));
TQWhatsThis::add( mCategoriesButton, whatsThis );
- connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories()));
+ connect(mCategoriesButton,TQ_SIGNAL(clicked()),TQ_SLOT(selectCategories()));
thirdLineLayout->addWidget( mCategoriesButton );
}
@@ -209,7 +209,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
i18n( "Push this button to create an advanced set of reminders "
"for this event or to-do." ) );
TQToolTip::add( mAlarmAdvancedButton, i18n( "Set an advanced reminder" ) );
- connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) );
+ connect( mAlarmAdvancedButton, TQ_SIGNAL(clicked()), TQ_SLOT(editAlarms()) );
alarmLayout->addWidget( mAlarmAdvancedButton );
mSimpleAlarmBox = new TQHBox( parent );
@@ -247,17 +247,17 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout )
mAlarmTimeEdit->setEnabled( false );
mAlarmIncrCombo->setEnabled( false );
mAlarmInfoLabel->setEnabled( false );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQT_SLOT(setEnabled(bool)) );
- connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQ_SLOT(setEnabled(bool)) );
+ connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQ_SLOT(setEnabled(bool)) );
}
void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout)
{
mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent );
- connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) ,
- this, TQT_SIGNAL( openURL( const KURL & ) ) );
+ connect( mAttachments, TQ_SIGNAL( openURL( const KURL & ) ) ,
+ this, TQ_SIGNAL( openURL( const KURL & ) ) );
topLayout->addWidget( mAttachments, 1 );
}
@@ -290,8 +290,8 @@ void KOEditorGeneral::selectCategories()
KOGlobals::fitDialogToScreen( categoryDialog );
categoryDialog->setSelected( mCategories );
- connect(categoryDialog, TQT_SIGNAL(editCategories()), this, TQT_SIGNAL(openCategoryDialog()));
- connect(this, TQT_SIGNAL(updateCategoryConfig()), categoryDialog, TQT_SLOT(updateCategoryConfig()));
+ connect(categoryDialog, TQ_SIGNAL(editCategories()), this, TQ_SIGNAL(openCategoryDialog()));
+ connect(this, TQ_SIGNAL(updateCategoryConfig()), categoryDialog, TQ_SLOT(updateCategoryConfig()));
if ( categoryDialog->exec() ) {
setCategories( categoryDialog->selectedCategories() );
@@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text )
TQObject *KOEditorGeneral::typeAheadReceiver() const
{
- return TQT_TQOBJECT(mSummaryEdit);
+ return mSummaryEdit;
}
void KOEditorGeneral::updateAttendeeSummary(int count)
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index c387792a..b005d608 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -48,7 +48,7 @@ using namespace KCal;
class FocusLineEdit : public TQLineEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
FocusLineEdit( TQWidget *parent );
@@ -65,7 +65,7 @@ class FocusLineEdit : public TQLineEdit
class KOEditorGeneral : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneral (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 49b4d969..2772fbee 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -60,10 +60,10 @@ KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent,
const char* name) :
KOEditorGeneral( parent, name)
{
- connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
- TQT_SLOT( setDuration() ) );
- connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
- TQT_SLOT( emitDateTimeStr() ));
+ connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
+ TQ_SLOT( setDuration() ) );
+ connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )),
+ TQ_SLOT( emitDateTimeStr() ));
}
KOEditorGeneralEvent::~KOEditorGeneralEvent()
@@ -95,7 +95,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
{
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal,
i18n("Date && Time"),parent);
TQWhatsThis::add( timeGroupBox,
i18n("Sets options related to the date and time of the "
@@ -130,22 +130,22 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame);
layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
- connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool)));
+ connect(mAlldayEventCheckbox, TQ_SIGNAL(toggled(bool)),TQ_SLOT(associateTime(bool)));
mDurationLabel = new TQLabel( timeBoxFrame );
layoutTimeBox->addWidget( mDurationLabel, 1, 3 );
// time widgets are checked if they contain a valid time
- connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
- this, TQT_SLOT(startTimeChanged(TQTime)));
- connect(mEndTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
- this, TQT_SLOT(endTimeChanged(TQTime)));
+ connect(mStartTimeEdit, TQ_SIGNAL(timeChanged(TQTime)),
+ this, TQ_SLOT(startTimeChanged(TQTime)));
+ connect(mEndTimeEdit, TQ_SIGNAL(timeChanged(TQTime)),
+ this, TQ_SLOT(endTimeChanged(TQTime)));
// date widgets are checked if they contain a valid date
- connect(mStartDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)),
- this, TQT_SLOT(startDateChanged(const TQDate&)));
- connect(mEndDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)),
- this, TQT_SLOT(endDateChanged(const TQDate&)));
+ connect(mStartDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)),
+ this, TQ_SLOT(startDateChanged(const TQDate&)));
+ connect(mEndDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)),
+ this, TQ_SLOT(endDateChanged(const TQDate&)));
TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
layoutTimeBox->addWidget( label, 2, 0 );
@@ -154,7 +154,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mRecEditButton = new TQPushButton( timeBoxFrame );
mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
recLayout->addWidget( mRecEditButton );
- connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) );
+ connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) );
mRecEditLabel = new TQLabel( TQString(), timeBoxFrame );
recLayout->addWidget( mRecEditLabel );
recLayout->addStretch( 1 );
@@ -206,12 +206,12 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la
barLayout->addWidget( label );
barLayout->addStretch( 1 );
TQPushButton *button = new TQPushButton( i18n("Accept"), mInvitationBar );
- connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(acceptInvitation()) );
- connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(acceptInvitation()) );
+ connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) );
barLayout->addWidget( button );
button = new TQPushButton( i18n("Decline"), mInvitationBar );
- connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(declineInvitation()) );
- connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) );
+ connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(declineInvitation()) );
+ connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) );
barLayout->addWidget( button );
mInvitationBar->hide();
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index c6ace2b1..0483d400 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -41,7 +41,7 @@ using namespace KCal;
class KOEditorGeneralEvent : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralEvent (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 9b27c063..34191bed 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -47,7 +47,7 @@
KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent,
const char *name )
- : KOEditorGeneral( TQT_TQOBJECT(parent), name )
+ : KOEditorGeneral( parent, name )
{
setType( "Journal" );
}
@@ -94,8 +94,8 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout
mTimeEdit = new KTimeEdit( parent );
dateLayout->addWidget( mTimeEdit );
- connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)),
- mTimeEdit, TQT_SLOT(setEnabled(bool)) );
+ connect( mTimeCheckBox, TQ_SIGNAL(toggled(bool)),
+ mTimeEdit, TQ_SLOT(setEnabled(bool)) );
dateLayout->addStretch();
setTime( TQTime( -1, -1, -1 ) );
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index 0a2eef18..0de0be42 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -47,7 +47,7 @@ using namespace KCal;
class KOEditorGeneralJournal : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 );
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 5af7fd60..b871575b 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -96,7 +96,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
kdDebug(5850) << k_funcinfo << endl;
TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout);
- TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal,
i18n("Date && Time"),parent);
timeLayout->addWidget(timeGroupBox);
@@ -113,46 +113,46 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame);
TQWhatsThis::add( mStartCheck, whatsThis );
layoutTimeBox->addWidget(mStartCheck,0,0);
- connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool)));
- connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified()));
+ connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableStartEdit(bool)));
+ connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(startDateModified()));
mStartDateEdit = new KDateEdit(timeBoxFrame);
TQWhatsThis::add( mStartDateEdit, whatsThis );
layoutTimeBox->addWidget(mStartDateEdit,0,1);
- connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified()));
+ connect(mStartDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(startDateModified()));
mStartTimeEdit = new KTimeEdit(timeBoxFrame);
TQWhatsThis::add( mStartTimeEdit,
i18n("Sets the start time for this to-do.") );
layoutTimeBox->addWidget(mStartTimeEdit,0,2);
- connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified()));
+ connect(mStartTimeEdit,TQ_SIGNAL(timeChanged(TQTime)),TQ_SLOT(startDateModified()));
whatsThis = i18n("Sets the due date for this to-do.");
mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame);
TQWhatsThis::add( mDueCheck, whatsThis );
layoutTimeBox->addWidget(mDueCheck,1,0);
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool)));
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool)));
- connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableDueEdit(bool)));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SIGNAL(dueDateEditToggle(bool)));
+ connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged()));
mDueDateEdit = new KDateEdit(timeBoxFrame);
TQWhatsThis::add( mDueDateEdit, whatsThis );
layoutTimeBox->addWidget(mDueDateEdit,1,1);
- connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged()));
+ connect(mDueDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(dateChanged()));
mDueTimeEdit = new KTimeEdit(timeBoxFrame);
TQWhatsThis::add( mDueTimeEdit,
i18n("Sets the due time for this to-do.") );
layoutTimeBox->addWidget(mDueTimeEdit,1,2);
- connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged()));
+ connect(mDueTimeEdit,TQ_SIGNAL(timeChanged( TQTime )),TQ_SLOT(dateChanged()));
mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame);
TQWhatsThis::add( mTimeButton,
i18n("Sets whether or not this to-do's start and due dates "
"have times associated with them.") );
layoutTimeBox->addWidget( mTimeButton, 0, 3 );
- connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool)));
- connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
+ connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableTimeEdits(bool)));
+ connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged()));
TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
layoutTimeBox->addWidget( label, 3, 0 );
@@ -161,7 +161,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
mRecEditButton = new TQPushButton( timeBoxFrame );
mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
recLayout->addWidget( mRecEditButton );
- connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) );
+ connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) );
mRecEditLabel = new TQLabel( TQString(), timeBoxFrame );
recLayout->addWidget( mRecEditLabel );
recLayout->addStretch( 1 );
@@ -195,7 +195,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
TQWhatsThis::add( mCompletedToggle,
i18n( "Click this checkbox to toggle the completed percentage of the to-do "
"between 0% or 100%" ) );
- connect( mCompletedToggle, TQT_SIGNAL(clicked()), TQT_SLOT(completedChanged()) );
+ connect( mCompletedToggle, TQ_SIGNAL(clicked()), TQ_SLOT(completedChanged()) );
completionLayout->addWidget( mCompletedToggle );
label->setBuddy( mCompletedToggle );
@@ -209,7 +209,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
TQString label = i18n( "Percent complete", "%1 %" ).arg( i );
mCompletedCombo->insertItem( label );
}
- connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
+ connect( mCompletedCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(completedChanged(int)) );
completionLayout->addWidget( mCompletedCombo );
mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent );
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 3ccf9c81..07395f1e 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -41,7 +41,7 @@ using namespace KCal;
class KOEditorGeneralTodo : public KOEditorGeneral
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorGeneralTodo (TQObject* parent=0,const char* name=0);
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index ac372db7..5a5beae6 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -578,7 +578,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- TQGroupBox *groupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("E&xceptions"),
+ TQGroupBox *groupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("E&xceptions"),
this );
topLayout->addWidget( groupBox );
@@ -620,12 +620,12 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
boxLayout->setRowStretch( 4, 1 );
boxLayout->setColStretch( 1, 3 );
- connect( addExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( addException() ) );
- connect( changeExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( changeException() ) );
- connect( deleteExceptionButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( deleteException() ) );
+ connect( addExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( addException() ) );
+ connect( changeExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( changeException() ) );
+ connect( deleteExceptionButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( deleteException() ) );
}
void ExceptionsWidget::addException()
@@ -700,7 +700,7 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mRangeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
+ mRangeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Recurrence Range"),
this );
TQWhatsThis::add( mRangeGroupBox,
i18n("Sets a range for which these recurrence rules will "
@@ -765,12 +765,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent,
endDateLayout->addStretch( 1 );
- connect( mNoEndDateButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
- connect( mEndDurationButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
- connect( mEndDateButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( showCurrentRange() ) );
+ connect( mNoEndDateButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
+ connect( mEndDurationButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
+ connect( mEndDateButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( showCurrentRange() ) );
}
void RecurrenceRangeWidget::setDefaults( const TQDateTime &from )
@@ -887,11 +887,11 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) :
topLayout->addWidget( mTypeCombo );
- connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( emitChoice() ) );
+ connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( emitChoice() ) );
} else {
mTypeCombo = 0;
- TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, this );
+ TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, this );
ruleButtonGroup->setFrameStyle( TQFrame::NoFrame );
topLayout->addWidget( ruleButtonGroup );
@@ -912,14 +912,14 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) :
i18n("Sets the event or to-do to recur yearly according "
"to the specified rules.") );
- connect( mDailyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mWeeklyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mMonthlyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
- connect( mYearlyButton, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( emitChoice() ) );
+ connect( mDailyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mWeeklyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mMonthlyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
+ connect( mYearlyButton, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( emitChoice() ) );
}
}
@@ -975,12 +975,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
TQWhatsThis::add( mEnabledCheck,
i18n("Enables recurrence for this event or to-do according "
"to the specified rules.") );
- connect( mEnabledCheck, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( setRecurrenceEnabled( bool ) ) );
+ connect( mEnabledCheck, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( setRecurrenceEnabled( bool ) ) );
topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 );
- mTimeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Appointment Time "),
+ mTimeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Appointment Time "),
this );
TQWhatsThis::add( mTimeGroupBox,
i18n("Displays appointment time information.") );
@@ -998,9 +998,9 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
// mDateTimeLabel = new TQLabel( timeFrame );
// layoutTimeFrame->addWidget( mDateTimeLabel );
- Qt::Orientation orientation;
- if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal;
- else orientation = Qt::Vertical;
+ TQt::Orientation orientation;
+ if ( KOPrefs::instance()->mCompactDialogs ) orientation = TQt::Horizontal;
+ else orientation = TQt::Vertical;
mRuleBox = new TQGroupBox( 1, orientation, i18n("Recurrence Rule"), this );
TQWhatsThis::add( mRuleBox,
@@ -1013,8 +1013,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
}
mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
- connect( mRecurrenceChooser, TQT_SIGNAL( chosen( int ) ),
- TQT_SLOT( showCurrentRule( int ) ) );
+ connect( mRecurrenceChooser, TQ_SIGNAL( chosen( int ) ),
+ TQ_SLOT( showCurrentRule( int ) ) );
if ( !KOPrefs::instance()->mCompactDialogs ) {
TQFrame *ruleSepFrame = new TQFrame( mRuleBox );
@@ -1047,16 +1047,16 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
i18n("Options concerning the time range during which "
"this event or to-do should recur.") );
topLayout->addWidget( mRecurrenceRangeButton, 3, 0 );
- connect( mRecurrenceRangeButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showRecurrenceRangeDialog() ) );
+ connect( mRecurrenceRangeButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showRecurrenceRangeDialog() ) );
mExceptionsWidget = 0;
mExceptionsDialog = new ExceptionsDialog( this );
mExceptions = mExceptionsDialog;
mExceptionsButton = new TQPushButton( i18n("Exceptions..."), this );
topLayout->addWidget( mExceptionsButton, 4, 0 );
- connect( mExceptionsButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showExceptionsDialog() ) );
+ connect( mExceptionsButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showExceptionsDialog() ) );
} else {
mRecurrenceRangeWidget = new RecurrenceRangeWidget( this );
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 00224b0c..04f979c9 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -148,7 +148,7 @@ class RecurYearly : public RecurBase
class RecurrenceChooser : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 );
@@ -182,7 +182,7 @@ class ExceptionsBase
class ExceptionsWidget : public TQWidget, public ExceptionsBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 );
@@ -230,7 +230,7 @@ class RecurrenceRangeBase
class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 );
@@ -281,7 +281,7 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase
class KOEditorRecurrence : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 );
@@ -348,7 +348,7 @@ class KOEditorRecurrence : public TQWidget
class KOEditorRecurrenceDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOEditorRecurrenceDialog( TQWidget *parent );
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index ef2dc5df..6bc3c0be 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -70,39 +70,39 @@ void KOEventEditor::init()
setupDesignerTabs( "event" );
// Propagate date time settings to recurrence tab
- connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) );
- connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ),
- mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) );
- connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ),
+ mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) );
+ connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
// Propagate date time settings to gantt tab and back
- connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mFreeBusy, TQT_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) );
- connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
- mGeneral, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
-
- connect( mGeneral, TQT_SIGNAL( focusReceivedSignal() ),
- TQT_SIGNAL( focusReceivedSignal() ) );
-
- connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ),
- TQT_SIGNAL( editCategories() ) );
- connect( this, TQT_SIGNAL( updateCategoryConfig() ),
- mGeneral, TQT_SIGNAL( updateCategoryConfig() ) );
-
- connect( mFreeBusy, TQT_SIGNAL(updateAttendeeSummary(int)),
- mGeneral, TQT_SLOT(updateAttendeeSummary(int)) );
-
- connect( mGeneral, TQT_SIGNAL(editRecurrence()),
- mRecurrenceDialog, TQT_SLOT(show()) );
- connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()),
- TQT_SLOT(updateRecurrenceSummary()) );
-
- connect( mGeneral, TQT_SIGNAL(acceptInvitation()),
- mFreeBusy, TQT_SLOT(acceptForMe()) );
- connect( mGeneral, TQT_SIGNAL(declineInvitation()),
- mFreeBusy, TQT_SLOT(declineForMe()) );
+ connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mFreeBusy, TQ_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ),
+ mGeneral, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+
+ connect( mGeneral, TQ_SIGNAL( focusReceivedSignal() ),
+ TQ_SIGNAL( focusReceivedSignal() ) );
+
+ connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ),
+ TQ_SIGNAL( editCategories() ) );
+ connect( this, TQ_SIGNAL( updateCategoryConfig() ),
+ mGeneral, TQ_SIGNAL( updateCategoryConfig() ) );
+
+ connect( mFreeBusy, TQ_SIGNAL(updateAttendeeSummary(int)),
+ mGeneral, TQ_SLOT(updateAttendeeSummary(int)) );
+
+ connect( mGeneral, TQ_SIGNAL(editRecurrence()),
+ mRecurrenceDialog, TQ_SLOT(show()) );
+ connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()),
+ TQ_SLOT(updateRecurrenceSummary()) );
+
+ connect( mGeneral, TQ_SIGNAL(acceptInvitation()),
+ mFreeBusy, TQ_SLOT(acceptForMe()) );
+ connect( mGeneral, TQ_SIGNAL(declineInvitation()),
+ mFreeBusy, TQ_SLOT(declineForMe()) );
}
void KOEventEditor::reload()
@@ -116,7 +116,7 @@ void KOEventEditor::reload()
void KOEventEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) );
+ mGeneral = new KOEditorGeneralEvent( this );
if( KOPrefs::instance()->mCompactDialogs ) {
TQFrame *topFrame = addPage(i18n("General"));
@@ -154,10 +154,10 @@ void KOEventEditor::setupGeneral()
mGeneral->initTime(topFrame,topLayout);
mGeneral->initDescription(topFrame,topLayout);
mGeneral->initAttachments(topFrame,topLayout);
- connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
- this, TQT_SLOT( openURL( const KURL& ) ) );
- connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
- mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
+ connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ),
+ this, TQ_SLOT( openURL( const KURL& ) ) );
+ connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
+ mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
}
mGeneral->finishSetup();
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index bb2405eb..4b3c99ea 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -47,7 +47,7 @@ using namespace KCal;
*/
class KOEventEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 73a0942e..1ab4b89e 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -50,44 +50,44 @@ KOEventPopupMenu::KOEventPopupMenu()
mCurrentDate = TQDate();
mHasAdditionalItems = false;
- insertItem( i18n("&Show"), this, TQT_SLOT( popupShow() ) );
+ insertItem( i18n("&Show"), this, TQ_SLOT( popupShow() ) );
mEditOnlyItems.append(
- insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) );
+ insertItem(i18n("&Edit..."), this, TQ_SLOT( popupEdit() ) ) );
#ifndef KORG_NOPRINTER
insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."),
- this, TQT_SLOT( print() ) );
+ this, TQ_SLOT( print() ) );
#endif
//------------------------------------------------------------------------
mEditOnlyItems.append( insertSeparator() );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"),
- this, TQT_SLOT( popupCut() ) ) );
+ this, TQ_SLOT( popupCut() ) ) );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"),
- this, TQT_SLOT( popupCopy() ) ) );
+ this, TQ_SLOT( popupCopy() ) ) );
// paste is always possible
insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"),
- this, TQT_SLOT( popupPaste() ) );
+ this, TQ_SLOT( popupPaste() ) );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"),
- this, TQT_SLOT( popupDelete() ) ) );
+ this, TQ_SLOT( popupDelete() ) ) );
//------------------------------------------------------------------------
mEditOnlyItems.append( insertSeparator() );
mEditOnlyItems.append(
insertItem( KOGlobals::self()->smallIcon("bell"), i18n("&Toggle Reminder"),
- this, TQT_SLOT( popupAlarm() ) ) );
+ this, TQ_SLOT( popupAlarm() ) ) );
//------------------------------------------------------------------------
mRecurrenceItems.append( insertSeparator() );
mRecurrenceItems.append(
insertItem( i18n("&Dissociate This Occurrence"),
- this, TQT_SLOT( dissociateOccurrence() ) ) );
+ this, TQ_SLOT( dissociateOccurrence() ) ) );
mRecurrenceItems.append(
insertItem( i18n("&Dissociate Future Occurrences"),
- this, TQT_SLOT( dissociateFutureOccurrence() ) ) );
+ this, TQ_SLOT( dissociateFutureOccurrence() ) ) );
insertSeparator();
insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."),
- this, TQT_SLOT(forward()) );
+ this, TQ_SLOT(forward()) );
}
void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd )
@@ -142,7 +142,7 @@ void KOEventPopupMenu::print()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, mCalendar, &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mCurrentIncidence );
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index cc846885..21c7b6aa 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -37,7 +37,7 @@ class Incidence;
using namespace KCal;
class KOEventPopupMenu : public TQPopupMenu {
- Q_OBJECT
+ TQ_OBJECT
public:
KOEventPopupMenu();
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 9bd038d2..7ac37573 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -61,24 +61,24 @@ KOEventPopupMenu *KOEventView::eventPopup()
{
KOEventPopupMenu *eventPopup = new KOEventPopupMenu;
- connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
- TQT_SIGNAL(cutIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
- TQT_SIGNAL(copyIncidenceSignal(Incidence *)) );
- connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()),
- TQT_SIGNAL(pasteIncidenceSignal()) );
- connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)) );
- connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) );
- connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(cutIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(cutIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(copyIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(copyIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQ_SIGNAL(pasteIncidenceSignal()),
+ TQ_SIGNAL(pasteIncidenceSignal()) );
+ connect( eventPopup, TQ_SIGNAL(toggleAlarmSignal(Incidence *)),
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)) );
+ connect( eventPopup, TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) );
return eventPopup;
}
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index a5441a83..d8b2a67a 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -54,7 +54,7 @@ class TQPopupMenu;
*/
class KOEventView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index ddd4fcde..7d36b4aa 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -43,7 +43,7 @@ KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char *
: TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("")
{
mIncidence = 0;
- connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) );
+ connect( this, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(message(const TQString &)) );
}
KOEventViewer::~KOEventViewer()
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 91fb0d4d..7758cfdc 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -24,7 +24,7 @@
#ifndef KOEVENTVIEWER_H
#define KOEVENTVIEWER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <tdeconfig.h>
#include <tqtextbrowser.h>
@@ -39,7 +39,7 @@ using namespace KCal;
*/
class KDE_EXPORT KOEventViewer : public TQTextBrowser
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 7e783695..12a2f79d 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -43,7 +43,7 @@ KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent,
setMinimumSize( 500, 500 );
resize( 520, 500 );
}
- connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) );
+ connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedDestruct()) );
}
KOEventViewerDialog::~KOEventViewerDialog()
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index f66ecafd..48c02c8a 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -25,7 +25,7 @@
#define KOEVENTVIEWERDIALOG_H
#include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include "koeventviewer.h"
namespace KCal {
@@ -40,7 +40,7 @@ class KOEventViewer;
*/
class KDE_EXPORT KOEventViewerDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 678426fd..b6f48cf7 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -23,7 +23,7 @@
#ifndef KORG_GLOBALS_H
#define KORG_GLOBALS_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <tqwidget.h>
class TQDate;
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 6e86c857..5c8342ac 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -84,10 +84,10 @@ KOGroupware::KOGroupware( CalendarView* view, KCal::CalendarResources* cal )
watcher->addDir( locateLocal( "data", "korganizer/income.cancel/" ) );
watcher->addDir( locateLocal( "data", "korganizer/income.reply/" ) );
watcher->addDir( locateLocal( "data", "korganizer/income.delegated/" ) );
- connect( watcher, TQT_SIGNAL( dirty( const TQString& ) ),
- this, TQT_SLOT( incomingDirChanged( const TQString& ) ) );
+ connect( watcher, TQ_SIGNAL( dirty( const TQString& ) ),
+ this, TQ_SLOT( incomingDirChanged( const TQString& ) ) );
// Now set the ball rolling
- TQTimer::singleShot( 0, this, TQT_SLOT(initialCheckForChanges()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(initialCheckForChanges()) );
}
void KOGroupware::initialCheckForChanges()
@@ -103,12 +103,12 @@ void KOGroupware::initialCheckForChanges()
void KOGroupware::slotViewNewIncidenceChanger( IncidenceChangerBase* changer )
{
// Call slot perhapsUploadFB if an incidence was added, changed or removed
- connect( changer, TQT_SIGNAL( incidenceAdded( Incidence* ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( changer, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( changer, TQT_SIGNAL( incidenceDeleted( Incidence * ) ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceAdded( Incidence* ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( changer, TQ_SIGNAL( incidenceDeleted( Incidence * ) ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
}
FreeBusyManager *KOGroupware::freeBusyManager()
@@ -116,10 +116,10 @@ FreeBusyManager *KOGroupware::freeBusyManager()
if ( !mFreeBusyManager ) {
mFreeBusyManager = new FreeBusyManager( this, "freebusymanager" );
mFreeBusyManager->setCalendar( mCalendar );
- connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
- mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) );
- connect( mView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- this, TQT_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) );
+ connect( mCalendar, TQ_SIGNAL( calendarChanged() ),
+ mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) );
+ connect( mView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ this, TQ_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) );
slotViewNewIncidenceChanger( mView->incidenceChanger() );
}
diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index ce253dfc..c4205637 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -64,7 +64,7 @@ using namespace KOrg;
class KOGroupware : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
static KOGroupware* create( CalendarView*, KCal::CalendarResources* );
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 6adb3cbc..13626feb 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -617,15 +617,15 @@ For security reasons, it is not recommended to store your password in the config
<tabstop>retrieveSavePassword</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">tdepimmacros.h</include>
+ <include location="global" impldecl="in declaration">kdemacros.h</include>
<include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
</includes>
-<Q_SIGNALS>
+<signals>
<signal>changed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
<slot>slotChanged()</slot>
-</Q_SLOTS>
+</slots>
<exportmacro>KDE_EXPORT</exportmacro>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index 329de2a6..e7348421 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -25,7 +25,7 @@
#ifndef KOHELPER_H
#define KOHELPER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
namespace KCal {
class Calendar;
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 40851e99..499a4580 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -75,8 +75,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption,
setButtonText( Default, i18n("&Templates...") );
}
- connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotManageTemplates() ) );
- connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( delayedDestruct() ) );
+ connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotManageTemplates() ) );
+ connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( delayedDestruct() ) );
}
KOIncidenceEditor::~KOIncidenceEditor()
@@ -139,12 +139,12 @@ void KOIncidenceEditor::slotManageTemplates()
kdDebug(5850) << "KOIncidenceEditor::manageTemplates()" << endl;
TemplateManagementDialog * const d = new TemplateManagementDialog( this, templates() );
- connect( d, TQT_SIGNAL( loadTemplate( const TQString& ) ),
- this, TQT_SLOT( slotLoadTemplate( const TQString& ) ) );
- connect( d, TQT_SIGNAL( templatesChanged( const TQStringList& ) ),
- this, TQT_SLOT( slotTemplatesChanged( const TQStringList& ) ) );
- connect( d, TQT_SIGNAL( saveTemplate( const TQString& ) ),
- this, TQT_SLOT( slotSaveTemplate( const TQString& ) ) );
+ connect( d, TQ_SIGNAL( loadTemplate( const TQString& ) ),
+ this, TQ_SLOT( slotLoadTemplate( const TQString& ) ) );
+ connect( d, TQ_SIGNAL( templatesChanged( const TQStringList& ) ),
+ this, TQ_SLOT( slotTemplatesChanged( const TQStringList& ) ) );
+ connect( d, TQ_SIGNAL( saveTemplate( const TQString& ) ),
+ this, TQ_SLOT( slotSaveTemplate( const TQString& ) ) );
d->exec();
return;
}
@@ -296,8 +296,8 @@ void KOIncidenceEditor::setupEmbeddedURLPage( const TQString &label,
topFrame );
topLayout->addWidget( wid );
mEmbeddedURLPages.append( topFrame );
- connect( wid, TQT_SIGNAL( openURL( const KURL & ) ) ,
- this, TQT_SLOT( openURL( const KURL & ) ) );
+ connect( wid, TQ_SIGNAL( openURL( const KURL & ) ) ,
+ this, TQ_SLOT( openURL( const KURL & ) ) );
// TODO: Call this method only when the tab is actually activated!
wid->loadContents();
}
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 8c397d7c..99104929 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -56,7 +56,7 @@ using namespace KOrg;
*/
class KOIncidenceEditor : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 14433c21..2dd2ae3a 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -45,7 +45,7 @@ class KOEditorGeneralJournal;
*/
class KOJournalEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 3bc78156..252bbc53 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -71,24 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
entry->setDate( dt );
entry->setIncidenceChanger( mChanger );
entry->show();
- connect( this, TQT_SIGNAL(flushEntries()),
- entry, TQT_SIGNAL(flushEntries()) );
+ connect( this, TQ_SIGNAL(flushEntries()),
+ entry, TQ_SIGNAL(flushEntries()) );
- connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)),
- entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) );
+ connect( this, TQ_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)),
+ entry, TQ_SLOT(setIncidenceChanger( IncidenceChangerBase *)) );
- connect( this, TQT_SIGNAL(journalEdited(Journal *)),
- entry, TQT_SLOT(journalEdited(Journal *)) );
- connect( this, TQT_SIGNAL(journalDeleted(Journal *)),
- entry, TQT_SLOT(journalDeleted(Journal *)) );
+ connect( this, TQ_SIGNAL(journalEdited(Journal *)),
+ entry, TQ_SLOT(journalEdited(Journal *)) );
+ connect( this, TQ_SIGNAL(journalDeleted(Journal *)),
+ entry, TQ_SLOT(journalDeleted(Journal *)) );
- connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)),
- this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)),
- this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( entry, TQ_SIGNAL(editIncidence(Incidence *,const TQDate &)),
+ this, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( entry, TQ_SIGNAL(deleteIncidence(Incidence *)),
+ this, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
- connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)),
- this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( entry, TQ_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)),
+ this, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
mEntries.insert( dt, entry );
}
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index e229a99f..f2ff84a2 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -40,7 +40,7 @@ class TQVBox;
*/
class KOJournalView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOJournalView( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index aa97348c..df52e88a 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -135,9 +135,9 @@ bool KOListView::ListItemVisitor::visit( Event *e )
TQString endDateTime;
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtStart(), e->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( TQt::ISODate ) );
mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) );
- mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) );
mItem->setText( Categories_Column, e->categoriesStr() );
return true;
@@ -167,14 +167,14 @@ bool KOListView::ListItemVisitor::visit( Todo *t )
if ( t->hasStartDate() ) {
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtStart(), t->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( TQt::ISODate ) );
} else {
mItem->setText( StartDateTime_Column, "---" );
}
if ( t->hasDueDate() ) {
mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtDue(), t->doesFloat() ) );
- mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::ISODate ) );
+ mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( TQt::ISODate ) );
} else {
mItem->setText( EndDateTime_Column, "---" );
}
@@ -190,7 +190,7 @@ bool KOListView::ListItemVisitor::visit( Journal *j )
// Just use the first line
mItem->setText( Summary_Column, j->description().section( "\n", 0, 0 ) );
mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( j->dtStart(), j->doesFloat() ) );
- mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) );
+ mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( TQt::ISODate ) );
return true;
}
@@ -227,21 +227,21 @@ KOListView::KOListView( Calendar *calendar,
/*
mPopupMenu->insertSeparator();
mPopupMenu->insertItem(i18n("Show Dates"), this,
- TQT_SLOT(showDates()));
+ TQ_SLOT(showDates()));
mPopupMenu->insertItem(i18n("Hide Dates"), this,
- TQT_SLOT(hideDates()));
+ TQ_SLOT(hideDates()));
*/
- connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
- TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
- TQT_SLOT( defaultItemAction( TQListViewItem * ) ) );
- connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *,
+ connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQ_SLOT( defaultItemAction( TQListViewItem * ) ) );
+ connect( mListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+ TQ_SLOT( defaultItemAction( TQListViewItem * ) ) );
+ connect( mListView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *,
const TQPoint &,
int ) ),
- TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( processSelectionChange() ) );
+ TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( processSelectionChange() ) );
// setMinimumSize(100,100);
mListView->restoreLayout( KOGlobals::self()->config(), "KOListView Layout" );
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 70ba080c..71f304af 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -67,7 +67,7 @@ class KOListViewToolTip : public TQToolTip
*/
class KOListView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit KOListView( Calendar *calendar,
diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp
index 9c843b59..641d5106 100644
--- a/korganizer/komessagebox.cpp
+++ b/korganizer/komessagebox.cpp
@@ -41,9 +41,9 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type,
dialog->setButtonOK( button3 );
dialog->setButtonText( KDialogBase::Yes, button1.text() );
dialog->setButtonText( KDialogBase::No, button2.text() );
- TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotYes()));
- TQObject::connect( dialog->actionButton( KDialogBase::No ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotNo()));
-// TQObject::connect( dialog, TQT_SIGNAL( noClicked() ), dialog, TQT_SLOT(slotNo()));
+ TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotYes()));
+ TQObject::connect( dialog->actionButton( KDialogBase::No ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotNo()));
+// TQObject::connect( dialog, TQ_SIGNAL( noClicked() ), dialog, TQ_SLOT(slotNo()));
bool checkboxResult = false;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ab61181c..23b477e1 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e )
{
TQListBox::mousePressEvent( e );
- if ( e->button() == Qt::RightButton ) {
+ if ( e->button() == TQt::RightButton ) {
emit rightClick();
}
}
@@ -259,7 +259,7 @@ void MonthViewItem::paint( TQPainter *p )
}
if ( !bgColor.isValid() ) {
- bgColor = palette().color( TQPalette::Normal,
+ bgColor = palette().color( TQPalette::Active,
sel ? TQColorGroup::Highlight :
TQColorGroup::Background );
}
@@ -286,7 +286,7 @@ void MonthViewItem::paint( TQPainter *p )
}
if ( !frameColor.isValid() ) {
- frameColor = palette().color( TQPalette::Normal,
+ frameColor = palette().color( TQPalette::Active,
sel ? TQColorGroup::Highlight :
TQColorGroup::Foreground );
} else {
@@ -405,13 +405,13 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
updateConfig();
- connect( mItemList, TQT_SIGNAL( doubleClicked( TQListBoxItem *) ),
- TQT_SLOT( defaultAction( TQListBoxItem * ) ) );
- connect( mItemList, TQT_SIGNAL( rightButtonPressed( TQListBoxItem *,
+ connect( mItemList, TQ_SIGNAL( doubleClicked( TQListBoxItem *) ),
+ TQ_SLOT( defaultAction( TQListBoxItem * ) ) );
+ connect( mItemList, TQ_SIGNAL( rightButtonPressed( TQListBoxItem *,
const TQPoint &) ),
- TQT_SLOT( contextMenu( TQListBoxItem * ) ) );
- connect( mItemList, TQT_SIGNAL( clicked( TQListBoxItem * ) ),
- TQT_SLOT( select() ) );
+ TQ_SLOT( contextMenu( TQListBoxItem * ) ) );
+ connect( mItemList, TQ_SIGNAL( clicked( TQListBoxItem * ) ),
+ TQ_SLOT( select() ) );
}
void MonthViewCell::setDate( const TQDate &date )
@@ -861,10 +861,10 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
mCells.insert( row * mDaysPerWeek + col, cell );
dayLayout->addWidget( cell, row + 2, col );
- connect( cell, TQT_SIGNAL(defaultAction(Incidence *)),
- TQT_SLOT(defaultAction(Incidence *)) );
- connect( cell, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( cell, TQ_SIGNAL(defaultAction(Incidence *)),
+ TQ_SLOT(defaultAction(Incidence *)) );
+ connect( cell, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
}
dayLayout->setRowStretch( row + 2, 1 );
}
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d9b63bd9..706a2e9f 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -50,7 +50,7 @@ class KOMonthCellToolTip : public TQToolTip
class KNoScrollListBox: public TQListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNoScrollListBox(TQWidget *parent=0, const char *name=0);
@@ -134,7 +134,7 @@ class KOMonthView;
*/
class MonthViewCell : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
class CreateItemVisitor;
@@ -244,7 +244,7 @@ class MonthViewCell : public TQWidget
*/
class KOMonthView: public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0fa1eb21..3e57a77c 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,7 @@
#include <tqdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include "koprefs_base.h"
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 08763b63..60fd3e45 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,7 +77,7 @@
#include "ktimeedit.h"
#include "koglobals.h"
#include "stdcalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
@@ -92,15 +92,15 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
KPrefsWidBool *emailControlCenter =
addWidBool( KOPrefs::instance()->emailControlCenterItem(), topFrame );
- connect(emailControlCenter->checkBox(),TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(toggleEmailSettings(bool)));
+ connect(emailControlCenter->checkBox(),TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(toggleEmailSettings(bool)));
mUserEmailSettings = new TQGrid( 2, topFrame );
addWidString( KOPrefs::instance()->userNameItem(), mUserEmailSettings );
addWidString( KOPrefs::instance()->userEmailItem(), mUserEmailSettings );
- TQGroupBox *saveGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Saving Calendar"),
+ TQGroupBox *saveGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Saving Calendar"),
topFrame);
addWidBool( KOPrefs::instance()->htmlWithSaveItem(), saveGroup );
@@ -109,8 +109,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
TQHBox *intervalBox = new TQHBox( saveGroup );
addWidInt( KOPrefs::instance()->autoSaveIntervalItem(), intervalBox );
- connect( autoSave->checkBox(), TQT_SIGNAL( toggled( bool ) ),
- intervalBox, TQT_SLOT( setEnabled( bool ) ) );
+ connect( autoSave->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+ intervalBox, TQ_SLOT( setEnabled( bool ) ) );
intervalBox->setSpacing( KDialog::spacingHint() );
new TQWidget( intervalBox );
@@ -171,8 +171,8 @@ class KOPrefsDialogTime : public KPrefsModule
TQWhatsThis::add( timeZoneLabel, whatsThis );
mTimeZoneCombo = new TQComboBox( timeZoneBox );
- connect( mTimeZoneCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mTimeZoneCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
FILE *f;
char tempstring[101] = "Unknown";
@@ -264,8 +264,8 @@ class KOPrefsDialogTime : public KPrefsModule
TQWhatsThis::add( holidayLabel, whatsThis );
mHolidayCombo = new TQComboBox( holidayRegBox );
- connect( mHolidayCombo, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mHolidayCombo, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
TQWhatsThis::add( mHolidayCombo, whatsThis );
@@ -319,7 +319,7 @@ class KOPrefsDialogTime : public KPrefsModule
topLayout->addWidget( defaultDuration->label(), 4, 0 );
topLayout->addWidget( defaultDuration->timeEdit(), 4, 1 );
- TQGroupBox *remindersGroupBox = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *remindersGroupBox = new TQGroupBox( 1, TQt::Horizontal,
i18n( "Reminders" ),
topFrame );
topLayout->addMultiCellWidget( remindersGroupBox, 5, 5, 0, 1 );
@@ -328,10 +328,10 @@ class KOPrefsDialogTime : public KPrefsModule
new TQLabel( i18n( "Default reminder time:" ), remindersBox );
mReminderTimeSpin = new KIntSpinBox( remindersBox );
- connect( mReminderTimeSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWidChanged()) );
+ connect( mReminderTimeSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWidChanged()) );
mReminderUnitsCombo = new KComboBox( remindersBox );
- connect( mReminderUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidChanged()) );
+ connect( mReminderUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidChanged()) );
mReminderUnitsCombo->insertItem( i18n( "minute(s)" ) );
mReminderUnitsCombo->insertItem( i18n( "hour(s)" ) );
mReminderUnitsCombo->insertItem( i18n( "day(s)" ) );
@@ -351,8 +351,8 @@ class KOPrefsDialogTime : public KPrefsModule
KURLRequester *rq = addWidPath( KOPrefs::instance()->audioFilePathItem(),
audioFileRemindersBox, filter )->urlRequester();
rq->setEnabled( cb->isChecked() );
- connect( cb, TQT_SIGNAL(toggled(bool)),
- rq, TQT_SLOT(setEnabled( bool)) );
+ connect( cb, TQ_SIGNAL(toggled(bool)),
+ rq, TQ_SLOT(setEnabled( bool)) );
TQHBox *eventRemindersBox = new TQHBox( remindersGroupBox );
addWidBool( KOPrefs::instance()->defaultEventRemindersItem(), eventRemindersBox )->checkBox();
@@ -364,10 +364,10 @@ class KOPrefsDialogTime : public KPrefsModule
topLayout->addWidget( alarmDefaultLabel, 6, 0 );
mAlarmTimeDefaultCheckBox = new TQCheckBox( topFrame );
topLayout->addWidget( mAlarmTimeDefaultCheckBox, 6, 1 );
- connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mAlarmTimeDefaultCheckBox, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotWidChanged() ) );
- TQGroupBox *workingHoursGroup = new TQGroupBox(1,Qt::Horizontal,
+ TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal,
i18n("Working Hours"),
topFrame);
topLayout->addMultiCellWidget( workingHoursGroup, 7, 7, 0, 1 );
@@ -390,8 +390,8 @@ class KOPrefsDialogTime : public KPrefsModule
"this box, or the working hours will not be "
"marked with color." ) );
- connect( mWorkDays[ index ], TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mWorkDays[ index ], TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotWidChanged() ) );
}
TQHBox *workStartBox = new TQHBox(workingHoursGroup);
@@ -510,7 +510,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( showTodosAgenda->checkBox() );
/*** Date Navigator Group ***/
- TQGroupBox *dateNavGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *dateNavGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Date Navigator"),
topFrame );
addWidBool( KOPrefs::instance()->dailyRecurItem(), dateNavGroup );
@@ -520,7 +520,7 @@ class KOPrefsDialogViews : public KPrefsModule
/*** Agenda View Group ***/
- TQGroupBox *agendaGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *agendaGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Agenda View"),
topFrame );
@@ -542,8 +542,8 @@ class KOPrefsDialogViews : public KPrefsModule
KPrefsWidBool *marcusBainsShowSeconds =
addWidBool( KOPrefs::instance()->marcusBainsShowSecondsItem(), agendaGroup );
- connect( marcusBainsEnabled->checkBox(), TQT_SIGNAL( toggled( bool ) ),
- marcusBainsShowSeconds->checkBox(), TQT_SLOT( setEnabled( bool ) ) );
+ connect( marcusBainsEnabled->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+ marcusBainsShowSeconds->checkBox(), TQ_SLOT( setEnabled( bool ) ) );
addWidBool( KOPrefs::instance()->selectionStartsEditorItem(), agendaGroup );
@@ -554,7 +554,7 @@ class KOPrefsDialogViews : public KPrefsModule
topLayout->addWidget( agendaGroup );
/*** Month View Group ***/
- TQGroupBox *monthGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *monthGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("Month View"),
topFrame );
addWidBool( KOPrefs::instance()->enableMonthScrollItem(), monthGroup );
@@ -564,7 +564,7 @@ class KOPrefsDialogViews : public KPrefsModule
/*** Todo View Group ***/
- TQGroupBox *todoGroup = new TQGroupBox( 1, Qt::Horizontal,
+ TQGroupBox *todoGroup = new TQGroupBox( 1, TQt::Horizontal,
i18n("To-do View"),
topFrame );
addWidBool( KOPrefs::instance()->fullViewTodoItem(), todoGroup );
@@ -700,7 +700,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
topLayout->addWidget( unsetCategoryColor->button(), 6, 1 );
// categories colors
- TQGroupBox *categoryGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Categories"),
+ TQGroupBox *categoryGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Categories"),
topFrame);
topLayout->addMultiCellWidget(categoryGroup,7,7,0,1);
@@ -711,17 +711,17 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
i18n( "Select here the event category you want to modify. "
"You can change the selected category color using "
"the button below." ) );
- connect(mCategoryCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateCategoryColor()));
+ connect(mCategoryCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateCategoryColor()));
mCategoryButton = new KColorButton(categoryGroup);
TQWhatsThis::add( mCategoryButton,
i18n( "Choose here the color of the event category selected "
"using the combo box above." ) );
- connect(mCategoryButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setCategoryColor()));
+ connect(mCategoryButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setCategoryColor()));
updateCategoryColor();
// resources colors
- TQGroupBox *resourceGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Resources"),
+ TQGroupBox *resourceGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Resources"),
topFrame);
topLayout->addMultiCellWidget(resourceGroup,8,8,0,1);
@@ -730,13 +730,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name )
i18n( "Select here resource you want to modify. "
"You can change the selected resource color using "
"the button below." ) );
- connect(mResourceCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateResourceColor()));
+ connect(mResourceCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateResourceColor()));
mResourceButton = new KColorButton(resourceGroup);
TQWhatsThis::add( mResourceButton,
i18n( "Choose here the color of the resource selected "
"using the combo box above." ) );
- connect(mResourceButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setResourceColor()));
+ connect(mResourceButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setResourceColor()));
updateResources();
topLayout->setRowStretch(9,1);
@@ -865,8 +865,8 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co
topFrame );
topLayout->addMultiCellWidget(useGroupwareBool->checkBox(),0,0,0,1);
// FIXME: This radio button should only be available when KMail is chosen
-// connect(thekmailradiobuttonupthere,TQT_SIGNAL(toggled(bool)),
-// useGroupwareBool->checkBox(), TQT_SLOT(enabled(bool)));
+// connect(thekmailradiobuttonupthere,TQ_SIGNAL(toggled(bool)),
+// useGroupwareBool->checkBox(), TQ_SLOT(enabled(bool)));
KPrefsWidBool *bcc =
addWidBool( KOPrefs::instance()->bccItem(), topFrame );
@@ -927,10 +927,10 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co
topLayout->addWidget(del,6,1);
//topLayout->setRowStretch(2,1);
- connect(add, TQT_SIGNAL( clicked() ), this, TQT_SLOT(addItem()) );
- connect(del, TQT_SIGNAL( clicked() ), this, TQT_SLOT(removeItem()) );
- connect(aEmailsEdit,TQT_SIGNAL( textChanged(const TQString&) ), this,TQT_SLOT(updateItem()));
- connect(mAMails,TQT_SIGNAL(selectionChanged(TQListViewItem *)),TQT_SLOT(updateInput()));
+ connect(add, TQ_SIGNAL( clicked() ), this, TQ_SLOT(addItem()) );
+ connect(del, TQ_SIGNAL( clicked() ), this, TQ_SLOT(removeItem()) );
+ connect(aEmailsEdit,TQ_SIGNAL( textChanged(const TQString&) ), this,TQ_SLOT(updateItem()));
+ connect(mAMails,TQ_SIGNAL(selectionChanged(TQListViewItem *)),TQ_SLOT(updateInput()));
load();
}
@@ -1018,7 +1018,7 @@ KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *pa
: KPrefsModule( KOPrefs::instance(), parent, name )
{
mGroupwarePage = new KOGroupwarePrefsPage( this );
- connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) );
+ connect( mGroupwarePage, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) );
( new TQVBoxLayout( this ) )->addWidget( mGroupwarePage );
load();
@@ -1127,12 +1127,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
buttonRowLayout->addWidget( mConfigureButton );
buttonRowLayout->addItem( new TQSpacerItem(1, 1, TQSizePolicy::Expanding) );
topLayout->addWidget( buttonRow );
- connect( mConfigureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( configure() ) );
+ connect( mConfigureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( configure() ) );
- connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
- connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
- TQT_SLOT( slotWidChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+ TQ_SLOT( slotWidChanged() ) );
load();
// usrReadConfig();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index 28fc3ba7..e6fec99c 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -40,7 +40,7 @@ class TQListView;
class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogMain( TQWidget *parent, const char *name );
@@ -53,7 +53,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogColors( TQWidget *parent, const char *name );
@@ -84,7 +84,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name );
@@ -108,7 +108,7 @@ class KOGroupwarePrefsPage;
class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name );
@@ -123,7 +123,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOPrefsDialogPlugins( TQWidget *parent, const char *name );
diff --git a/korganizer/korgac/CMakeLists.txt b/korganizer/korgac/CMakeLists.txt
index c870221b..f3055729 100644
--- a/korganizer/korgac/CMakeLists.txt
+++ b/korganizer/korgac/CMakeLists.txt
@@ -27,7 +27,11 @@ link_directories(
##### other data ################################
-install( FILES korgac.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE korgac.desktop
+ DESTINATION ${AUTOSTART_INSTALL_DIR}
+ PO_DIR korganizer-desktops
+)
##### korgac (executable) #######################
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index cc0bb283..80610483 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
// User3 => Dismiss Selected
// Ok => Suspend
- connect( calendar, TQT_SIGNAL(calendarChanged()),
- this, TQT_SLOT(slotCalendarChanged()) );
+ connect( calendar, TQ_SIGNAL(calendarChanged()),
+ this, TQ_SLOT(slotCalendarChanged()) );
TDEGlobal::iconLoader()->addAppDir( "tdepim" );
setButtonOK( i18n( "Suspend" ) );
@@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox );
topLayout->addWidget( label );
- mSplitter = new TQSplitter( Qt::Vertical, topBox );
+ mSplitter = new TQSplitter( TQt::Vertical, topBox );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
topLayout->addWidget( mSplitter );
@@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
mIncidenceListView->setShowSortIndicator( true );
mIncidenceListView->setAllColumnsShowFocus( true );
mIncidenceListView->setSelectionMode( TQListView::Extended );
- connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
- connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) );
- connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) );
- connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) );
+ connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) );
+ connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) );
+ connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) );
+ connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) );
mDetailView = new KOEventViewer( mCalendar, mSplitter );
mDetailView->setFocus(); // set focus here to start with to make it harder
@@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
mSuspendUnit->insertItem( i18n("week(s)") );
mSuspendUnit->setCurrentItem( defSuspendUnit );
- connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) );
+ connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) );
setMainWidget( mIncidenceListView );
mIncidenceListView->setMinimumSize( 500, 50 );
@@ -544,7 +544,21 @@ void AlarmDialog::wakeUp()
}
if ( activeReminders )
+ {
+ DCOPRef screensaver("kdesktop", "KScreensaverIface");
+ DCOPReply reply = screensaver.call("isBlanked");
+ bool res = true;
+ if (reply.isValid()) {
+ reply.get(res);
+ }
show();
+ if (res)
+ {
+ // Lower the dialog if the screensaver is active or its status unknown.
+ // This prevents reminders to show on a locked screen.
+ lower();
+ }
+ }
setTimer();
showDetails();
emit reminderCount( activeCount() );
diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index 949c17f7..d11dc591 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -43,7 +43,7 @@ class TQSpinBox;
class TQSplitter;
class AlarmDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 081d91ca..a5cb277e 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled );
// Set up the context menu
- mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) );
- mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) );
+ mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) );
+ mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) );
contextMenu()->setItemEnabled( mSuspendAll, false );
contextMenu()->setItemEnabled( mDismissAll, false );
contextMenu()->insertSeparator();
mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this,
- TQT_SLOT( toggleAlarmsEnabled() ) );
+ TQ_SLOT( toggleAlarmsEnabled() ) );
mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this,
- TQT_SLOT( toggleAutostart() ) );
+ TQ_SLOT( toggleAutostart() ) );
contextMenu()->setItemChecked( mAutostartId, autostart );
contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled );
@@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
kdDebug(5890) << "No Quit standard action." << endl;
} else {
#if KDE_IS_VERSION(3,3,90)
- quit->disconnect( TQT_SIGNAL( activated() ), this,
- TQT_SLOT( maybeQuit() ) );
- connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) );
+ quit->disconnect( TQ_SIGNAL( activated() ), this,
+ TQ_SLOT( maybeQuit() ) );
+ connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) );
}
#else //FIXME: remove for KDE 4.0
- quit->disconnect( TQT_SIGNAL( activated() ), tqApp,
- TQT_SLOT( closeAllWindows() ) );
+ quit->disconnect( TQ_SIGNAL( activated() ), tqApp,
+ TQ_SLOT( closeAllWindows() ) );
}
- connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) );
+ connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) );
#endif
TQToolTip::add(this, mName );
@@ -188,7 +188,7 @@ void AlarmDockWindow::enableAutostart( bool enable )
void AlarmDockWindow::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == Qt::LeftButton ) {
+ if ( e->button() == TQt::LeftButton ) {
kapp->startServiceByDesktopName( "korganizer", TQString() );
} else {
KSystemTray::mousePressEvent( e );
diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h
index 6f6cd7bd..81c00a8c 100644
--- a/korganizer/korgac/alarmdockwindow.h
+++ b/korganizer/korgac/alarmdockwindow.h
@@ -30,7 +30,7 @@
class AlarmDockWindow : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
AlarmDockWindow( const char *name = 0 );
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 2a87c7fd..37478ca0 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
mDocker = new AlarmDockWindow;
mDocker->show();
- connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) );
- connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) );
+ connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) );
+ connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) );
TDEConfig c( locate( "config", "korganizerrc" ) );
c.setGroup( "Time & Date" );
@@ -58,7 +58,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
mCalendar->readConfig();
mCalendar->load();
- connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) );
+ connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) );
TDEConfig *config = kapp->config();
config->setGroup( "Alarms" );
@@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar,
if ( !mDialog ) {
mDialog = new AlarmDialog( calendar );
- connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) );
- connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) );
- connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) );
- connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) );
+ connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) );
+ connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) );
+ connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) );
+ connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) );
}
mDialog->addIncidence( incidence, dt, displayText );
diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h
index a8628848..ef6e5d27 100644
--- a/korganizer/korgac/koalarmclient.h
+++ b/korganizer/korgac/koalarmclient.h
@@ -43,7 +43,7 @@ class Incidence;
class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOAlarmClient( TQObject *parent = 0, const char *name = 0 );
diff --git a/korganizer/korgac/korgac.desktop b/korganizer/korgac/korgac.desktop
index c20f2f5f..2ae6af98 100644
--- a/korganizer/korgac/korgac.desktop
+++ b/korganizer/korgac/korgac.desktop
@@ -1,93 +1,11 @@
[Desktop Entry]
Name=KOrganizer Reminder Client
-Name[af]=KOrganizer herhinner kliënt
-Name[ar]=زبون المنبه لِــ KOrganizer
-Name[bg]=Аларма на KOrganizer
-Name[ca]=Client de l'alarma de KOrganizer
-Name[cs]=Klient upomínek KOrganizeru
-Name[da]=KOrganizer-påmindelsesklient
-Name[de]=KOrganizer Erinnerungsfunktion
-Name[el]=Πελάτης υπενθύμισης του KOrganizer
-Name[eo]=Alarmilo por Organizilo
-Name[es]=Cliente de recordatorio para KOrganizer
-Name[et]=KOrganizeri meeldetuletuse klientprogramm
-Name[eu]=KOrganizer-en oroigarrien bezeroa
-Name[fa]=کارخواه یادآوری‌کنندۀ KOrganizer
-Name[fi]=KOrganizer-hälytysasiakas
-Name[fr]=Client d'alarme de KOrganizer
-Name[fy]=KOrganizer omtinkerdaemon
-Name[gl]=Cliente de Lembranzas de KOrganizer
-Name[hu]=KOrganizer-emlékeztető kliens
-Name[is]=Áminningarforrit fyrir KOrganizer
-Name[it]=Client degli avvisi di KOrganizer
-Name[ja]=KOrganizer リマインダクライアント
-Name[kk]=KOrganizer-дің еске салу клиенті
-Name[km]=កម្មវិធី​រំលឹក​របស់ KOrganizer
-Name[lt]=KOrganizer priminimų klientas
-Name[mk]=Клиент за потсетување во КОрганизатор
-Name[nb]=KOrganizer klient for påminning
-Name[nds]=KOrganizer-Anstöötgever
-Name[ne]=केडीई आयोजक रिमाइन्डर क्लाइन्ट
-Name[nl]=KOrganizer herinneringsdaemon
-Name[nn]=Alarmklient for KOrganizer
-Name[pl]=Klient przypominania KOrganizera
-Name[pt]=Cliente de Avisos do KOrganizer
-Name[pt_BR]=Cliente do Alarme do KOrganizer
-Name[ru]=Уведомления KOrganizer
-Name[sk]=Klient pripomienok pre KOrganizer
-Name[sl]=Odjemalec za opomnik KOrganizerja
-Name[sr]=Клијент подсетника KOrganizer-а
-Name[sr@Latn]=Klijent podsetnika KOrganizer-a
-Name[sv]=Korganizer-påminnelseklient
-Name[tr]=KOrganizer Hatırlatma İstemcisi
-Name[uk]=Клієнт нагадувань KOrganizer
-Name[zh_CN]=KOrganizer 定时器客户端程序
-Name[zh_TW]=KOrganizer 提醒客戶端程式
+
+GenericName=KOrganizer Reminder Daemon Client
+
Exec=korgac --miniicon korganizer
Icon=korganizer
Type=Application
-GenericName=KOrganizer Reminder Daemon Client
-GenericName[af]=Korganizer herhinner bediener kliënt
-GenericName[bg]=Демон за алармата на KOrganizer
-GenericName[ca]=Client del dimoni d'alarma de KOrganizer
-GenericName[cs]=Klient démona přípomínek KOrganizeru
-GenericName[da]=KOrganizer-påmindelsesklient
-GenericName[de]=Hintergrund-Erinnerungsfunktion für KOrganizer
-GenericName[el]=Δαίμονας πελάτη υπενθύμισης του KOrganizer
-GenericName[eo]=Kliento por la alarmo-demono de Organizilo
-GenericName[es]=Cliente del daemon de recordatorio para KOrganizer
-GenericName[et]=KOrganizeri meeldetuletusdeemoni klientprogramm
-GenericName[eu]=KOrganizer-en oroigarrien deabruaren bezeroa
-GenericName[fa]=کارخواه شبح یادآوری KOrganizer
-GenericName[fi]=KOrganizer hälytyspalvelimen asiakas
-GenericName[fr]=Client pour le démon d'alarme de KOrganizer
-GenericName[fy]=KOrganizer omtinkerdaemon
-GenericName[gl]=Daemon do Cliente de Lembranzas de KOrganizer
-GenericName[hu]=KOrganizer emlékeztető szolgáltatás kliense
-GenericName[is]=Áminningarpúki fyrir KOrganizer
-GenericName[it]=Client del demone degli avvisi di KOrganizer
-GenericName[ja]=KOrganizer リマインダデーモンクライアント
-GenericName[kk]=Organizer-дің еске салу қызметінің клиенті
-GenericName[km]=កម្មវិធី​ដេមិន​អ្នក​រំលឹក​របស់ KOrganizer
-GenericName[lt]=KOrganizer priminimų tarnybos klientas
-GenericName[nb]=KOrganizer klient for påminningstjenesten
-GenericName[nds]=Client för den Anstötendämoon vun KOrganizer
-GenericName[ne]=केडीई आयोजक रिमाइन्डर डेइमन क्लाइन्ट
-GenericName[nl]=KOrganizer herinneringsdaemon
-GenericName[nn]=Alarmnisseklient for KOrganizer
-GenericName[pl]=Klient demona przypominania KOrganizera
-GenericName[pt]=Cliente do Servidor de Avisos do KOrganizer
-GenericName[pt_BR]=Cliente do Servidor de Alarme do KOrganizer
-GenericName[ru]=Клиент службы уведомлений KOrganizer
-GenericName[sk]=Klient KOrganizer pre démona pripomienok
-GenericName[sl]=Pritajeni odjemalec za opomnik KOrganizerja
-GenericName[sr]=Клијент демона подсетника KOrganizer-а
-GenericName[sr@Latn]=Klijent demona podsetnika KOrganizer-a
-GenericName[sv]=Korganizer-alarmdemonklient
-GenericName[tr]=KOrganizer Hatırlatma Servisi İstemcisi
-GenericName[uk]=Демон клієнта нагадування для KOrganizer
-GenericName[zh_CN]=KOrganizer 定时守护进程的客户端程序
-GenericName[zh_TW]=KOrganizr 提醒守護程式客戶端
Terminal=false
X-TDE-autostart-after=panel
X-TDE-autostart-condition=korgacrc:General:Autostart:true
diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp
index 5646d709..16bf76bc 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -101,8 +101,8 @@ KOrganizer::KOrganizer( const char *name )
mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" );
setCentralWidget(mCalendarView);
- mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false );
- (void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" );
+ mActionManager = new ActionManager( this, mCalendarView, this, this, false );
+ (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" );
}
KOrganizer::~KOrganizer()
@@ -128,8 +128,8 @@ void KOrganizer::init( bool document )
}
mActionManager->init();
- connect( mActionManager, TQT_SIGNAL( actionNew( const KURL & ) ),
- TQT_SLOT( newMainWindow( const KURL & ) ) );
+ connect( mActionManager, TQ_SIGNAL( actionNew( const KURL & ) ),
+ TQ_SLOT( newMainWindow( const KURL & ) ) );
mActionManager->loadParts();
@@ -139,7 +139,7 @@ void KOrganizer::init( bool document )
KStatusBar *bar = statusBar();
bar->insertItem( "", ID_GENERAL, 10 );
- connect( bar, TQT_SIGNAL( pressed( int ) ), TQT_SLOT( statusBarPressed( int ) ) );
+ connect( bar, TQ_SIGNAL( pressed( int ) ), TQ_SLOT( statusBarPressed( int ) ) );
KPIM::ProgressDialog *progressDialog = new KPIM::ProgressDialog( bar, this );
progressDialog->hide();
@@ -150,8 +150,8 @@ void KOrganizer::init( bool document )
bar->addWidget( progressWidget, 0, true );
- connect( mActionManager->view(), TQT_SIGNAL( statusMessage( const TQString & ) ),
- TQT_SLOT( showStatusMessage( const TQString & ) ) );
+ connect( mActionManager->view(), TQ_SIGNAL( statusMessage( const TQString & ) ),
+ TQ_SLOT( showStatusMessage( const TQString & ) ) );
setStandardToolBarMenuEnabled( true );
setTitle();
@@ -208,9 +208,9 @@ void KOrganizer::initActions()
setStandardToolBarMenuEnabled( true );
createStandardStatusBarAction();
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection());
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars() ), actionCollection());
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
setAutoSaveSettings();
createGUI( 0 );
diff --git a/korganizer/korganizer.desktop b/korganizer/korganizer.desktop
index ec1046d1..cdc11758 100644
--- a/korganizer/korganizer.desktop
+++ b/korganizer/korganizer.desktop
@@ -1,143 +1,18 @@
[Desktop Entry]
MimeType=text/calendar;text/x-vcalendar;
+
+Name=KOrganizer
+
+GenericName=Personal Organizer
+
Comment=Calendar and Scheduling Program
-Comment[af]=Kalender en Skedulering Program
-Comment[ar]=برنامج الجدولة والتقويم
-Comment[bg]=Програма за календар и разписание
-Comment[bs]=Kalendar i rokovnik
-Comment[ca]=Un programa de calendari i planificació
-Comment[cs]=Kalendářový a plánovací program
-Comment[cy]=Rhaglen Galendr a Drefnlennu
-Comment[da]=Kalender- og planlægningsprogram
-Comment[de]=Ein Kalender und Zeitplaner
-Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
-Comment[eo]=Kalendara kaj plana programo
-Comment[es]=Calendario y planificador
-Comment[et]=Kalendri ja ajakava haldamise rakendus
-Comment[eu]=Egutegi eta antolaketa progrmaa
-Comment[fa]=تقویم و برنامۀ زمان‌بندی
-Comment[fi]=Kalenteri ja ajanhallintaohjelma
-Comment[fr]=Calendrier et agenda personnel
-Comment[fy]=Aginda- en ôfsprakenprogramma
-Comment[gl]=Programa de Calendario e Axenda
-Comment[he]=תוכניות לוח שנה ותזמון משימות
-Comment[hi]=कैलेन्डर तथा समय-सारणी प्रोग्राम
-Comment[hr]=Kalendar i rokovnik
-Comment[hu]=Határidőnapló és eseményszervező
-Comment[is]=Dagbók og skipulag
-Comment[it]=Programma di calendario e di agenda
-Comment[ja]=カレンダーとスケジュール管理プログラム
-Comment[kk]=Күнтізбе және Жоспарлау бағдарламасы
-Comment[km]=កម្មវិធី​ប្រតិទិន និង​កាលវិភាគ
-Comment[lt]=Kalendoriaus ir planavimo programa
-Comment[lv]=Kalendāra un Plānošanas Programma
-Comment[mk]=Програма за календари и закажувања
-Comment[ms]=Kalendar dan Program Penjadualan
-Comment[mt]=Programm b' kalendarju w skeda
-Comment[nb]=Et kalender- og tidsplanleggingsprogram
-Comment[nds]=Kalenner un Tietplaner
-Comment[ne]=क्यालेन्डर र कार्यतालिका कार्यक्रम
-Comment[nl]=Agenda- en afsprakenprogramma
-Comment[nn]=Kalender- og planleggingsprogram
-Comment[nso]=Lenaneo la Peakanyo ya Tshupamabaka
-Comment[pl]=Kalendarz i terminarz
-Comment[pt]=Calendário e Programa de Escalonamento
-Comment[pt_BR]=Programa de Calendário e Agenda
-Comment[ro]=Program de planificare şi calendar
-Comment[ru]=Календарь и личное расписание
-Comment[se]=Kaleandar- ja plánenprográmma
-Comment[sk]=Kalendár a plánovací program
-Comment[sl]=Program za koledar in razporejanje
-Comment[sr]=Календарски и планерски програм
-Comment[sr@Latn]=Kalendarski i planerski program
-Comment[sv]=Kalender- och schemaläggningsprogram
-Comment[ta]=நாள்காட்டி மற்றும் திட்ட நிரல்
-Comment[tg]=Тақвимот ва ҷадвали шахсӣ
-Comment[th]=โปรแกรมจัดการบันทึกประจำวันและตารางการนัดหมาย
-Comment[tr]=Takvim ve Zamanlama Programı
-Comment[uk]=Програма календаря та розкладу
-Comment[uz]=Календар ва режалаштириш дастури
-Comment[ven]=Khalenda na mbekanyamushumo ya u shedula
-Comment[vi]=Chương trình lịch và kế hoạch
-Comment[xh]=Ikhalenda no Dweliso lwenkqubo Yokucwangcisa
-Comment[zh_CN]=日历和日程安排程序
-Comment[zh_TW]=行事曆與排程軟體
-Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
+
Exec=korganizer %U
Icon=korganizer
Path=
X-DocPath=korganizer/index.html
Type=Application
Terminal=false
-Name=KOrganizer
-Name[af]=Korganizer
-Name[cy]=KTrefnydd
-Name[eo]=KOrganizilo
-Name[hi]=के-आर्गेनाइज़र
-Name[lv]=KOrganaizers
-Name[mk]=КОрганизатор
-Name[ne]=केडीई आयोजक
-Name[nso]=KMokopanyi
-Name[pl]=Organizator
-Name[sv]=Korganizer
-Name[ta]=கேஅமைப்பாளர்
-Name[ven]=Mulugisi wa K
-Name[zh_TW]=KOrganizer 行事曆
-GenericName=Personal Organizer
-GenericName[af]=Persoonlike Organiseerder
-GenericName[ar]=المنظم الشخصي
-GenericName[be]=Пэрсанальны арганізатар
-GenericName[bg]=Организатор
-GenericName[bs]=Lični organizer
-GenericName[ca]=Organitzador personal
-GenericName[cs]=Osobní organizér
-GenericName[cy]=Trefnydd Personol
-GenericName[da]=Personlig organisering
-GenericName[de]=Persönliche Daten organisieren
-GenericName[el]=Προσωπικός οργανωτής
-GenericName[en_GB]=Personal Organiser
-GenericName[eo]=Persona Organizilo
-GenericName[es]=Organizador personal
-GenericName[et]=Personaalne ajaarvestus
-GenericName[eu]=Antolatzaile pertsonala
-GenericName[fa]=سازمان‌دهندۀ شخصی
-GenericName[fi]=Henkilökohtainen ajanhallintaohjelma
-GenericName[fr]=Organiseur personnel
-GenericName[fy]=Persoanlike organizer
-GenericName[gl]=Organizador Persoal
-GenericName[he]=מנהל זמן אישי
-GenericName[hi]=निजी प्रबंधक
-GenericName[hu]=Határidőnapló
-GenericName[is]=Persónuleg skipulagsbók
-GenericName[it]=Organizzatore personale
-GenericName[ja]=個人向けスケジュール管理
-GenericName[kk]=Дербес ұйымдастырғышы
-GenericName[km]=កម្មវិធី​រៀបចំ​ផ្ទាល់​ខ្លួន
-GenericName[lt]=Asmeninės informacijos tvarkyklė
-GenericName[mk]=Личен организатор
-GenericName[ms]=Penyusun Peribadi
-GenericName[nb]=Personlig planlegger
-GenericName[nds]=Persöönlich Mötenkalenner
-GenericName[ne]=व्यक्तिगत आयोजक
-GenericName[nl]=Persoonlijke organizer
-GenericName[nn]=Personleg organiserar
-GenericName[pl]=Osobisty organizator
-GenericName[pt]=Organizador Pessoal
-GenericName[pt_BR]=Organizador Pessoal
-GenericName[ro]=Organizator personal
-GenericName[ru]=Персональный органайзер
-GenericName[sk]=Osobný plánovač
-GenericName[sl]=Osebni organizator
-GenericName[sr]=Лични планер
-GenericName[sr@Latn]=Lični planer
-GenericName[sv]=Filofax
-GenericName[ta]=தனிப்பயன் அமைப்பாளர்
-GenericName[tg]=Органайзери инфиродӣ
-GenericName[tr]=Kişisel Bilgi Yöneticisi
-GenericName[uk]=Персональний тижневик
-GenericName[uz]=Шахсий органайзер
-GenericName[zh_CN]=个人日程安排
-GenericName[zh_TW]=個人行程組織軟體
X-TDE-ServiceTypes=Browser/View,DCOP/Organizer
X-TDE-Library=libkorganizerpart
X-TDE-StartupNotify=true
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index 76505f7f..56614604 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -64,7 +64,7 @@ typedef KParts::MainWindow KPartsMainWindow;
*/
class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/korganizer_configcolors.desktop b/korganizer/korganizer_configcolors.desktop
index f19f4a1d..a654cd1a 100644
--- a/korganizer/korganizer_configcolors.desktop
+++ b/korganizer/korganizer_configcolors.desktop
@@ -12,177 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Colors
-Name[af]=Kleure
-Name[ar]=الألوان
-Name[az]=Rənglər
-Name[be]=Колеры
-Name[bg]=Цветове
-Name[br]=Livioù
-Name[bs]=Boje
-Name[cs]=Barvy
-Name[cy]=Lliwiau
-Name[da]=Farver
-Name[de]=Farben
-Name[el]=Χρώματα
-Name[en_GB]=Colours
-Name[eo]=Koloroj
-Name[es]=Colores
-Name[et]=Värvid
-Name[eu]=Koloreak
-Name[fa]=رنگها
-Name[fi]=Värit
-Name[fr]=Couleurs
-Name[fy]=Kleuren
-Name[ga]=Dathanna
-Name[gl]=Cores
-Name[he]=צבעים
-Name[hi]=रंग
-Name[hr]=Boje
-Name[hu]=Színek
-Name[id]=Warna
-Name[is]=Litir
-Name[it]=Colori
-Name[ja]=色
-Name[kk]=Түстері
-Name[km]=ពណ៌
-Name[lt]=Spalvos
-Name[lv]=Krāsas
-Name[mk]=Бои
-Name[ms]=Warna
-Name[mt]=Kuluri
-Name[nb]=Farger
-Name[nds]=Klören
-Name[ne]=रङ
-Name[nl]=Kleuren
-Name[nn]=Fargar
-Name[pl]=Kolory
-Name[pt]=Cores
-Name[pt_BR]=Cores
-Name[ro]=Culori
-Name[ru]=Цвета
-Name[rw]=Amabara
-Name[se]=Ivnnit
-Name[sk]=Farby
-Name[sl]=Barve
-Name[sr]=Боје
-Name[sr@Latn]=Boje
-Name[sv]=Färger
-Name[ta]=வண்ணங்கள்
-Name[tg]=Рангҳо
-Name[th]=สี
-Name[tr]=Renkler
-Name[uk]=Кольори
-Name[uz]=Ранглар
-Name[ven]=Mivhala
-Name[vi]=Màu
-Name[xh]=Imibala
-Name[zh_CN]=颜色
-Name[zh_TW]=顏色
-Name[zu]=Imibala
+
Comment=KOrganizer Colors Configuration
-Comment[af]=KOrganizer kleure opstelling
-Comment[ar]=إعداد ألوان KOrganizer
-Comment[be]=Канфігурацыя колераў KOrganizer
-Comment[bg]=Настройки на цветовете за KOrganizer
-Comment[bs]=KOrganizer podešavanje boja
-Comment[ca]=Configuració de colors a KOrganizer
-Comment[cs]=Nastavení barev KOrganizeru
-Comment[cy]=Ffurfweddiad Lliwiau KTrefnydd
-Comment[da]=KOrganizer farveindstilling
-Comment[de]=Farbenfestlegung für KOrganizer
-Comment[el]=Ρύθμιση χρωμάτων του KOrganizer
-Comment[en_GB]=KOrganizer Colours Configuration
-Comment[eo]=KOrganizilo Kolor-agordo
-Comment[es]=Configuración de los colores de KOrganizer
-Comment[et]=KOrganizeri värvide seadistamine
-Comment[eu]=KOrganizer-en koloreen konfigurazioa
-Comment[fa]=پیکربندی رنگهای KOrganizer
-Comment[fi]=KOrganizer värien asetukset
-Comment[fr]=Configuration des couleurs de KOrganizer
-Comment[fy]=KOrganizer kleuren ynstelle
-Comment[gl]=Configuración de Cores de KOrganizer
-Comment[he]=הגדרות צבעים של הארגונית
-Comment[hi]=के-आर्गेनाइज़र रंग कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer színbeállítások
-Comment[is]=KOrganizer litastillingar
-Comment[it]=Configurazione dei colori di Korganizer
-Comment[ja]=KOrganizer 色設定
-Comment[kk]=KOrganizer-дің түстер параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ពណ៌ KOrganizer
-Comment[lt]=KOrganizer spalvų konfigūravimas
-Comment[mk]=Конфигурација на боите
-Comment[ms]=KOnfigurasi Warna KOrganizer
-Comment[nb]=KOrganizer fargeoppsett
-Comment[nds]=Klören för KOrganizer instellen
-Comment[ne]=केडीई आयोजक रङ कन्फिगरेसन
-Comment[nl]=KOrganizer kleuren instellen
-Comment[nn]=KOrganizer, fargeinnstillingar
-Comment[pl]=Konfiguracja kolorów KOrganizera
-Comment[pt]=Configuração de Cores do KOrganizer
-Comment[pt_BR]=Configuração de Cores do KOrganizer
-Comment[ro]=Configurare culori KOrganizer
-Comment[ru]=Настройка цветов органайзера TDE
-Comment[se]=KOrganizer, ivdneheivehusat
-Comment[sk]=Nastavenie farieb pre KOrganizer
-Comment[sl]=Nastavitve barv v KOrganizerju
-Comment[sr]=Подешавање боја у KOrganizer-у
-Comment[sr@Latn]=Podešavanje boja u KOrganizer-u
-Comment[sv]=Inställning av Korganizers färger
-Comment[ta]=கேஅமைப்பவர் வண்ணங்களின் கட்டமைப்பு
-Comment[tg]=Танзимотҳои ранги органайзери TDE
-Comment[tr]=KOrganizer Renk Yapılandırması
-Comment[uk]=Налаштування кольорів у KOrganizer
-Comment[zh_CN]=KOrganizer 颜色配置
-Comment[zh_TW]=KOrganizer 顏色設定
+
Keywords=korganizer;colors;
-Keywords[be]=K Арганізатар;колеры;korganizer;colors;
-Keywords[bg]=организатор; цветове; настройки; korganizer; colors;
-Keywords[br]=korganizer;livioù;
-Keywords[bs]=korganizer;colors;boje;boja;
-Keywords[cs]=korganizer;barvy;
-Keywords[cy]=korganizer;ktrefnydd;lliwiau;
-Keywords[da]=korganizer;farver;
-Keywords[de]=KOrganizer;Farben;
-Keywords[el]=korganizer;χρώματα;
-Keywords[en_GB]=korganizer;colours;
-Keywords[eo]=korganizilo; koloroj;
-Keywords[es]=korganizer;colores;
-Keywords[et]=korganizer;värvid;
-Keywords[eu]=korganizer;koloreak;
-Keywords[fa]=korganizer،رنگها;
-Keywords[fi]=korganizer;värit;
-Keywords[fr]=KOrganizer;couleurs;
-Keywords[fy]=korganizer;colors;kleuren;
-Keywords[ga]=korganizer;dathanna;
-Keywords[gl]=korganizer;cores;
-Keywords[he]=korganizer;colors; ארגונית; צבעים;
-Keywords[hi]=के-आर्गेनाइज़र;रंग;
-Keywords[hu]=korganizer;színek;
-Keywords[is]=korganizer;litir;
-Keywords[it]=korganizer;colori;
-Keywords[ja]=korganizer;色;
-Keywords[km]=korganizer;ពណ៌;
-Keywords[lt]=korganizer;colors; spalvos;
-Keywords[mk]=korganizer;colors;корганизатор;бои;
-Keywords[ms]=korganizer;warna;
-Keywords[nb]=korganizer;farger;
-Keywords[nds]=KOrganizer;Klören;
-Keywords[ne]=केडीई आयोजक; रङ;
-Keywords[nl]=korganizer;colors;kleuren;
-Keywords[nn]=korganizer;fargar;
-Keywords[pl]=korganizer;kolory;kolor;
-Keywords[pt]=korganizer;cores;
-Keywords[pt_BR]=korganizer;cores;
-Keywords[ro]=korganizer;culori;
-Keywords[ru]=korganizer;colors;органайзер;цвета;
-Keywords[sk]=korganizer;farby;
-Keywords[sl]=korganizer;barve;
-Keywords[sr]=korganizer;colors;планер;боје;
-Keywords[sr@Latn]=korganizer;colors;planer;boje;
-Keywords[sv]=korganizer;färger;
-Keywords[ta]=கேஅமைப்பாளர்; வண்ணங்கள்;
-Keywords[tg]=korganizer;colors;органайзер;рангҳо;
-Keywords[tr]=korganizer;renkler;
-Keywords[uk]=korganizer;кольори;
-Keywords[uz]=korganizer;органайзер;ранглар;
-Keywords[zh_CN]=korganizer;colors;颜色;
diff --git a/korganizer/korganizer_configdesignerfields.desktop b/korganizer/korganizer_configdesignerfields.desktop
index 274c809c..bbdbf04d 100644
--- a/korganizer/korganizer_configdesignerfields.desktop
+++ b/korganizer/korganizer_configdesignerfields.desktop
@@ -12,147 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Custom Pages
-Name[af]=Pasmaak Blaaie
-Name[ar]=الصفحات المعتادة
-Name[bg]=Потребителски полета
-Name[br]=Pajennoù dre ziouer
-Name[bs]=Vlastite stranice
-Name[ca]=Pàgines a mida
-Name[cs]=Vlastní stránky
-Name[da]=Brugervalgte sider
-Name[de]=Benutzerdefinierte Seiten
-Name[el]=Προσαρμοσμένες σελίδες
-Name[eo]=Propraj Paĝoj
-Name[es]=Páginas personalizadas
-Name[et]=Omaloodud leheküljed
-Name[eu]=Orri pertsonalizatuak
-Name[fa]=صفحات سفارشی
-Name[fi]=Omat sivut
-Name[fr]=Pages personnalisées
-Name[fy]=Oanpaste siden
-Name[ga]=Leathanaigh Shaincheaptha
-Name[gl]=Páxinas Personalizadas
-Name[he]=דפים מותאמים אישית
-Name[hu]=Egyéni lapok
-Name[is]=Sérsniðnar síður
-Name[it]=Pagine personalizzate
-Name[ja]=カスタムページ
-Name[kk]=Қосымша парақтар
-Name[km]=ទំព័រ​ផ្ទាល់​ខ្លួន
-Name[lt]=Pasirinkti puslapiai
-Name[mk]=Сопствени страници
-Name[ms]=Halaman Kebiasaan
-Name[nb]=Tilpassede sider
-Name[nds]=Egen Sieden
-Name[ne]=अनुकूल पृष्ठ
-Name[nl]=Aangepaste pagina's
-Name[nn]=Tilpassa sider
-Name[pl]=Własne strony
-Name[pt]=Páginas Personalizadas
-Name[pt_BR]=Páginas personalizadas
-Name[ru]=Дополнительные поля
-Name[se]=Iežat siiddut
-Name[sk]=Vlastné stránky
-Name[sl]=Prilagojene strani
-Name[sr]=Посебне странице
-Name[sr@Latn]=Posebne stranice
-Name[sv]=Egna sidor
-Name[ta]=தனிபயன் பக்கங்கள்
-Name[tg]=Варақаҳои замимавии истифодашаванда
-Name[tr]=Özel Sayfa
-Name[uk]=Нетипові сторінки
-Name[zh_CN]=定制页
+
Comment=Configure the Custom Pages
-Comment[af]=Stel die pasmaak blaaie op
-Comment[ar]=إعداد الصفحات المعتادة
-Comment[bg]=Настройки на потребителските полета
-Comment[br]=Kefluniañ ar pajennoù diouzhoc'h
-Comment[bs]=Podesite vlastite stranice
-Comment[ca]=Configura les pàgines a mida
-Comment[cs]=Nastavení vlastních stránek
-Comment[da]=Indstil de selvvalgte sider
-Comment[de]=Einstellungen für benutzerdefinierte Seiten
-Comment[el]=Ρύθμιση των προσαρμοσμένων σελίδων
-Comment[eo]=Agordi la proprajn paĝojn
-Comment[es]=Configura las páginas personalizadas
-Comment[et]=Omaloodud lehekülgede seadistamine
-Comment[eu]=Konfiguratu orri pertsonalizatuak
-Comment[fa]=پیکربندی صفحات سفارشی
-Comment[fi]=Muokkaa omia sivuja
-Comment[fr]=Configurer les pages personnalisées
-Comment[fy]=Hjir kinne jo de oanpaste siden ynstelle
-Comment[ga]=Cumraigh na Leathanaigh Shaincheaptha
-Comment[gl]=Configurar as Páxinas Personalizadas
-Comment[he]=הגדר את הדפים המותאמים אישית
-Comment[hu]=Az egyéni lapok beállítása
-Comment[is]=Stilla sérsniðnu síðurnar
-Comment[it]=Configura le pagine personalizzate
-Comment[ja]=カスタムページの設定
-Comment[kk]=Қосымша парақтарды баптау
-Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ទំព័រ​ផ្ទាល់​ខ្លួន
-Comment[lt]=Konfigūruoti darbastalių skaičių ir pavadinimus
-Comment[mk]=Конфигурирајте ги сопствените страници
-Comment[ms]=Konfigurkan Halaman Langganan
-Comment[nb]=Stille inn de tilpassede sidene
-Comment[nds]=Egen Sieden instellen
-Comment[ne]=अनुकूल पृष्ठ कन्फिगर गर्नुहोस्
-Comment[nl]=Hier kunt u de aangepaste pagina's instellen
-Comment[nn]=Set opp dei tilpassa sidene
-Comment[pl]=Konfiguracja własnych stron
-Comment[pt]=Configurar as Páginas Personalizadas
-Comment[pt_BR]=Configurar Páginas personalizadas
-Comment[ru]=Настройка пользовательских вкладок
-Comment[se]=Heivet iežat siidduid
-Comment[sk]=Nastavenie vlastných stránok
-Comment[sl]=Nastavi prilagojene strani
-Comment[sr]=Подешавање посебних страница
-Comment[sr@Latn]=Podešavanje posebnih stranica
-Comment[sv]=Anpassa egna sidor
-Comment[ta]=தனிபயன் பக்கங்களை கட்டமை
-Comment[tg]=Танзимоти варақаҳои замимавии истифодашаванда
-Comment[tr]=Özel Sayfaları Yapılandır
-Comment[uk]=Налаштування нетипових сторінок
-Comment[zh_CN]=配置定制页
-Comment[zh_TW]=設定 Custom Pages
+
Keywords=korganizer; configure; settings; custom fields;
-Keywords[bg]=организатор; настройки; korganizer; configure; settings; custom fields;
-Keywords[ca]=korganizer; configura; opcions; camps a mida;
-Keywords[cs]=korganizer;nastavení;vlastní pole;
-Keywords[da]=korganizer; indstil; opsætning; brugervalgte felter;
-Keywords[de]=KOrganizer;konfigurieren;Einstellungen;benutzerdefinierte Felder;
-Keywords[el]=korganizer; ρύθμιση; ρυθμίσεις; προσαρμοσμένα πεδία;
-Keywords[es]=korganizer; configurar; opciones; campos personalizados;
-Keywords[et]=korganizer; seadistamine; seadistused; omaloodud väljad;
-Keywords[eu]=korganizer; konfiguratu; ezarpenak; eremu pertsonalizatuak;
-Keywords[fa]=korganizer، پیکربندی، تنظیمات، حوزه‌های سفارشی;
-Keywords[fi]=kaddressbook; aseta; asetukset;omat kentät;
-Keywords[fr]=KOrganizer; configuration; configurer; champs personnalisés;
-Keywords[fy]=korganizer; configuratie; instellingen; ynstellings; oanpaste fjilden; aangepaste velden;
-Keywords[ga]=korganizer; cumraigh; socruithe; réimsí saincheaptha;
-Keywords[gl]=korganizer; configurar; opcións; campos personalizados;
-Keywords[he]=korganizer; configure; settings; custom fields; הגדרות; תצורה; שדות; מותאמים אישית;
-Keywords[hu]=korganizer;beállítás;beállítások;egyéni mezők;
-Keywords[is]=korganizer; stillingar; stilla; sérsniðnir reitir;
-Keywords[it]=korganizer; configura; impostazioni; campi personalizzati;
-Keywords[ja]=korganizer、設定、設定;カスタムフィールド;
-Keywords[km]=korganizer;កំណត់​រចនាសម្ព័ន្ធ;ការ​កំណត់;វាល​ផ្ទាល់​ខ្លួន;
-Keywords[lt]=korganizer; configure; settings; custom fields; konfigūruoti; nustatymai; pasirinkti laukai;
-Keywords[mk]=korganizer; configure; settings; custom fields; корганизатор; конфигурација; конфигурирање; поставувања; сопствени полиња;
-Keywords[ms]=korganizer; konfigur; seting; medan kebiasaan;
-Keywords[nb]=kaddressbook; sette opp; innstillinger; tilpassede felter;
-Keywords[nds]=KOrganizer;Instellen;egen Feller;
-Keywords[ne]=केडीई आयोजक; कन्फिगर; सेटिङ; अनुकूल फिल्ड;
-Keywords[nl]=korganizer; configuratie; instellingen; aangepaste velden;
-Keywords[nn]=korganizer; oppsett; innstillingar; tilpassa felt;
-Keywords[pl]=korganizer;konfiguracja;ustawienia;własne pola;
-Keywords[pt]=korganizer; configurar; configuração; campos personalizados;
-Keywords[pt_BR]=korganizer;configurar;configurações; campos personalizados;
-Keywords[ru]=korganizer; configure; settings; custom fields; настройка; органайзер;
-Keywords[sl]=korganizer; nastavi; nastavitve; prilagojena polja;
-Keywords[sr]=korganizer; configure; settings; custom fields; подешавање; посебна поља;
-Keywords[sr@Latn]=korganizer; configure; settings; custom fields; podešavanje; posebna polja;
-Keywords[sv]=korganizer;anpassa;inställningar;egna fält;
-Keywords[ta]=கேஅமைப்பாளர்; வடிவமைப்பு; அமைப்புகள்; தனிபயன் புலங்கள்;
-Keywords[tr]=korganizer; yapılandır; yapılandırma; özel alanlar;
-Keywords[uk]=korganizer; configure; settings; custom fields; налаштування; параметри; нетипові поля;
-Keywords[zh_CN]=korganizer; configure; settings; custom fields; 配置; 设置; 定制项;
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index 3c61556d..eaad9f5e 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -12,174 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Fonts
-Name[af]=Skrif tipes
-Name[ar]=المحارف
-Name[az]=Yazı növləri
-Name[be]=Шрыфты
-Name[bg]=Шрифтове
-Name[br]=Fontoù
-Name[bs]=Fontovi
-Name[ca]=Tipus de lletres
-Name[cs]=Písma
-Name[cy]=Wynebfathau
-Name[da]=Skrifttyper
-Name[de]=Schriften
-Name[el]=Γραμματοσειρές
-Name[eo]=Tiparoj
-Name[es]=Tipografías
-Name[et]=Fondid
-Name[eu]=Letra-tipoak
-Name[fa]=قلمها
-Name[fi]=Kirjasimet
-Name[fr]=Polices
-Name[fy]=Lettertypen
-Name[ga]=Clónna
-Name[gl]=Fontes
-Name[he]=גופנים
-Name[hi]=फ़ॉन्ट्स
-Name[hr]=Pisma
-Name[hu]=Betűtípusok
-Name[is]=Letur
-Name[it]=Tipi di carattere
-Name[ja]=フォント
-Name[kk]=Қаріптері
-Name[km]=ពុម្ពអក្សរ
-Name[lt]=Šriftai
-Name[lv]=Fonti
-Name[mk]=Фонтови
-Name[ms]=Fon
-Name[nb]=Skrifter
-Name[nds]=Schriftoorden
-Name[ne]=फन्ट
-Name[nl]=Lettertypen
-Name[nn]=Skrifttypar
-Name[pl]=Czcionki
-Name[pt]=Tipos de Letra
-Name[pt_BR]=Fontes
-Name[ro]=Fonturi
-Name[ru]=Шрифты
-Name[rw]=Imyandikire
-Name[se]=Fonttat
-Name[sk]=Písma
-Name[sl]=Pisave
-Name[sr]=Фонтови
-Name[sr@Latn]=Fontovi
-Name[sv]=Teckensnitt
-Name[ta]=எழுத்துருக்கள்
-Name[tg]=Ҳарфҳо
-Name[th]=รูปแบบตัวอักษร
-Name[tr]=Yazı tipleri
-Name[uk]=Шрифти
-Name[uz]=Шрифтлар
-Name[ven]=Fontu
-Name[vi]=Phông
-Name[xh]=Ubungakanani bamagama
-Name[zh_CN]=字体
-Name[zh_TW]=字型
+
Comment=KOrganizer Fonts Configuration
-Comment[af]=KOrganizer skrif tipe opstelling
-Comment[ar]=إعداد المحارف لِــ KOrganizer
-Comment[be]=Канфігурацыя шрыфтоў "K Арганізатара"
-Comment[bg]=Настройки на шрифтовете за KOrganizer
-Comment[bs]=KOrganizer podešavanje fontova
-Comment[ca]=Configuració de lletres al KOrganizer
-Comment[cs]=Nastavení písem KOrganizeru
-Comment[cy]=ffurfweddiad Wynebfathau KTrefnydd
-Comment[da]=KOrganizer skrifttypeindstilling
-Comment[de]=Schriftenfestlegung für KOrganizer
-Comment[el]=Ρύθμιση γραμματοσειρών του KOrganizer
-Comment[eo]=KOrganizilo Tipar-agordo
-Comment[es]=Configuración de las tipografías de KOrganizer
-Comment[et]=KOrganizeri fontide seadistamine
-Comment[eu]=KOrganizer-en letra-tipoen konfigurazioa
-Comment[fa]=پیکربندی قلمهای KOrganizer
-Comment[fi]=Korganizer kirjasinten asetukset
-Comment[fr]=Configuration des polices de KOrganizer
-Comment[fy]=KOrganizer lettertypen ynstelle
-Comment[gl]=Configuración de Fontes de KOrganizer
-Comment[he]=הגדרות גופנים של הארגונים
-Comment[hi]=के-आर्गेनाइज़र फ़ॉन्ट्स कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer betűtípus-beállítások
-Comment[is]=KOrganizer leturstillingar
-Comment[it]=Configurazione font di KOrganizer
-Comment[ja]=KOrganizer フォント設定
-Comment[kk]=KOrganizer-дің қаріптер параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ពុម្ពអក្សរ KOrganizer
-Comment[lt]=KOrganizer šriftų konfigūravimas
-Comment[mk]=Конфигурација на фонтовите
-Comment[ms]=Konfigurasi Fon KOrganizer
-Comment[nb]=KOrganizer skriftoppsett
-Comment[nds]=Schriftoorden för KOrganizer instellen
-Comment[ne]=केडीई आयोजक फन्ट कन्फिगरेसन
-Comment[nl]=KOrganizer lettertypen instellen
-Comment[nn]=KOrganizer, skriftinnstillingar
-Comment[pl]=Konfiguracja czcionek KOrganizera
-Comment[pt]=Configuração dos Tipos de Letra do KOrganizer
-Comment[pt_BR]=Configuração de Fontes do KOrganizer
-Comment[ro]=Configurare fonturi KOrganizer
-Comment[ru]=Настройка шрифтов органайзера TDE
-Comment[se]=KOrganizer, fontaheivehusat
-Comment[sk]=Nastavenie písiem pre KOrganizer
-Comment[sl]=Nastavitev pisav v KOrganizerju
-Comment[sr]=Подешавање фонтова у KOrganizer-у
-Comment[sr@Latn]=Podešavanje fontova u KOrganizer-u
-Comment[sv]=Inställning av Korganizers teckensnitt
-Comment[ta]=கேஅமைப்பாளர் எழுத்துருக்கள் கட்டமைப்பு
-Comment[tg]=Танзимотҳои ҳуруфҳои органайзери TDE
-Comment[tr]=KOrganizer Yazıtipi Yapılandırması
-Comment[uk]=Налаштування шрифтів у KOrganizer
-Comment[zh_CN]=KOrganizer 字体配置
-Comment[zh_TW]=KOrganizer 字型設定
+
Keywords=korganizer;fonts;
-Keywords[af]=korganizer; fonts;
-Keywords[be]=K Арганізатар;шрыфты;korganizer;fonts;
-Keywords[bg]=организатор; шрифтове; настройки; korganizer; fonts;
-Keywords[br]=korganizer;nodrezhoù;
-Keywords[bs]=korganizer;fonts;fontovi;
-Keywords[ca]=korganizer;lletres;
-Keywords[cs]=korganizer;písma;
-Keywords[cy]=korganizer;ktrefnydd;wynebfathau;
-Keywords[da]=korganizer;skrifttyper;
-Keywords[de]=KOrganizer;Schriften;
-Keywords[el]=korganizer;γραμματοσειρές;
-Keywords[eo]=korganizilo; tiparoj;
-Keywords[es]=korganizer;tipografías;
-Keywords[et]=korganizer;fondid;
-Keywords[eu]=korganizer;letra-tipoak;
-Keywords[fa]=korganizer،قلمها;
-Keywords[fi]=korganizer;kirjasimet;
-Keywords[fr]=KOrganizer;polices;
-Keywords[fy]=korganizer;fonts;lettertypen;
-Keywords[ga]=korganizer;clónna;clófhoirne;
-Keywords[gl]=korganizer;fontes;
-Keywords[he]=korganizer;fonts;ארגונית;גופנים;גופן;פונט;פונטים;
-Keywords[hi]=के-आर्गेनाइज़र;फ़ॉन्ट्स;
-Keywords[hu]=korganizer;betűtípusok;
-Keywords[is]=korganizer;letur;
-Keywords[it]=korganizer;font;
-Keywords[ja]=korganizer;フォント;
-Keywords[km]=korganizer;ពុម្ពអក្សរ;
-Keywords[lt]=korganizer;fonts; šriftai;
-Keywords[mk]=korganizer;fonts;корганизатор;фонтови;
-Keywords[ms]=korganizer;fon;
-Keywords[nb]=korganizer;skrifter; skrifttyper;
-Keywords[nds]=KOrganizer;Schriftoorden;
-Keywords[ne]=केडीई आयोजक; फन्ट;
-Keywords[nl]=korganizer;fonts;lettertypen;
-Keywords[nn]=korganizer;skrift;
-Keywords[pl]=korganizer;czcionki;
-Keywords[pt]=korganizer;tipos de letra;
-Keywords[pt_BR]=korganizer;fontes;
-Keywords[ro]=korganizer;fonturi;
-Keywords[ru]=korganizer;fonts;органайзер;шрифты;
-Keywords[sk]=korganizer;písma;
-Keywords[sl]=korganizer;pisave;
-Keywords[sr]=korganizer;fonts;планер;фонтови;фонт;текст;
-Keywords[sr@Latn]=korganizer;fonts;planer;fontovi;font;tekst;
-Keywords[sv]=korganizer;teckensnitt;
-Keywords[ta]=கேஅமைப்பாளர்;எழுத்துரு;
-Keywords[tg]=korganizer;fonts;органайзер;ҳуруфҳо;
-Keywords[tr]=korganizer;yazıtipleri;
-Keywords[uk]=korganizer;шрифти;
-Keywords[uz]=korganizer;органайзер;шрифтлар;
-Keywords[zh_CN]=korganizer;fonts;字体;
diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop
index 9e55a567..12ef8c11 100644
--- a/korganizer/korganizer_configfreebusy.desktop
+++ b/korganizer/korganizer_configfreebusy.desktop
@@ -12,146 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Free/Busy
-Name[af]=Beskikbaar/Besig
-Name[ar]=متوفّر/مشغول
-Name[bg]=Свободен/зает
-Name[bs]=Slobodan/Zauzet
-Name[ca]=Lliure/ocupat
-Name[cs]=Aktivita
-Name[cy]=Rhydd/Prysur
-Name[da]=Fri/Optaget
-Name[de]=Frei/Beschäftigt
-Name[eo]=Libera/Okupita
-Name[es]=Libre/Ocupado
-Name[et]=Vaba/hõivatud
-Name[eu]=Libre/Lanpetuta
-Name[fa]=آزاد/اشغال
-Name[fi]=Vapaa/Varattu
-Name[fr]=Disponibilité
-Name[fy]=Frij/beset
-Name[gl]=Ceibe/Ocupado
-Name[hi]=फ्री/बिज़ी
-Name[hu]=Foglaltság
-Name[is]=Tímaráðstöfun
-Name[it]=Libero/Occupato
-Name[ja]=動静情報
-Name[kk]=Бос/Істе
-Name[km]=ទំនេរ/រវល់
-Name[lt]=Užimtumas
-Name[mk]=Слободен/зафатен
-Name[ms]=Lapang/Sibuk
-Name[nb]=Ledig/Opptatt
-Name[nds]=Free/Bunnen
-Name[ne]=स्वतन्त्र/व्यस्त
-Name[nl]=Vrij/bezet
-Name[nn]=Ledig/opptatt
-Name[pl]=Wolny/zajęty
-Name[pt]=Livre/Ocupado
-Name[pt_BR]=Livre/Ocupado
-Name[ru]=Занятое время
-Name[sk]=Voľný čas
-Name[sl]=Prost/zaseden
-Name[sr]=Слободан/заузет
-Name[sr@Latn]=Slobodan/zauzet
-Name[sv]=Ledig/upptagen
-Name[ta]=சுதந்திரமான/வேலையில் இருக்கும்
-Name[tg]=Озод/машғул аст
-Name[tr]=Boş/Meşgul
-Name[uk]=Вільний/зайнятий час
-Name[uz]=Бўш/Банд
-Name[zh_CN]=忙/闲
-Name[zh_TW]=行程資訊
+
Comment=KOrganizer Free/Busy Configuration
-Comment[af]=KOrganizer Beskikbaar/Besig opstelling
-Comment[bg]=Настройки на свободно/заето за KOrganizer
-Comment[bs]=KOrganizer podešavanje za Slobodan/Zauzet
-Comment[ca]=Configuració de Lliure/ocupat per a KOrganizer
-Comment[cs]=Nastavení aktivity pro KOrganizer
-Comment[cy]=Ffurfweddiad Rhydd/Prysur KTrefnydd
-Comment[da]=KOrganizer Fri/Optaget-indstilling
-Comment[de]=Frei/Beschäftigt-Festlegung für KOrganizer
-Comment[el]=Ρυθμίσεις KOrganizer Free/Busy
-Comment[eo]=KOrganizilo Agordo pri libero/okupito
-Comment[es]=Configuración de libre/ocupado de KOrganizer
-Comment[et]=KOrganizeri vaba/hõivatuse seadistused
-Comment[eu]=KOrganizer-en Libre/Lanpetuta konfigurazioa
-Comment[fa]=پیکربندی آزاد/اشغال KOrganizer
-Comment[fi]=KOrganizer vapaa/varattu asetukset
-Comment[fr]=Configuration de la disponibilité pour KOrganizer
-Comment[fy]=KOrganizer frij/beset ynstelle
-Comment[gl]=Configuración de Dispoñibilidade de Korganizer
-Comment[hi]=के-आर्गेनाइज़र फ्री/बिज़ी कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer foglaltsági beállítások
-Comment[is]=KOrganizer stillingar fyrir tímaráðstöfun
-Comment[it]=Configurazione Libero/Occupato di KOrganizer
-Comment[ja]=KOrganizer 動静情報の設定
-Comment[kk]=KOrganizer--дің Бос/Істе мәлімет параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ទំនេរ/រវល់ របស់ KOrganizer
-Comment[lt]=KOrganizer užimtumo konfigūravimas
-Comment[mk]=Конфигурација на слободни/зафатени термини
-Comment[ms]=Konfigurasi Lapang/Sibuk KOrganizer
-Comment[nb]=KOrganizer oppsett for ledig/opptatt tid
-Comment[nds]=Free/Bunnen-Instellen för KOrganizer
-Comment[ne]=केडीई आयोजक स्वतन्त्र/व्यस्त कन्फिगरेसन
-Comment[nl]=KOrganizer vrij/bezet instellen
-Comment[nn]=KOrganizer, ledig/opptatt-innstillingar
-Comment[pl]=Konfiguracja czasu wolnego/zajętego dla KOrganizera
-Comment[pt]=Configuração de Livre/Ocupado do KOrganizer
-Comment[pt_BR]=Configuração Livre/Ocupado do KOrganizer
-Comment[ru]=Настройка свободного и занятого времени органайзера TDE
-Comment[sk]=Nastavenie voľného času pre KOrganizer
-Comment[sl]=Nastavitev prost/zaseden za KOrganizer
-Comment[sr]=Подешавање слободног/заузетог у KOrganizer-у
-Comment[sr@Latn]=Podešavanje slobodnog/zauzetog u KOrganizer-u
-Comment[sv]=Inställning av ledig/upptagen i Korganizer
-Comment[ta]=கேஅமைப்பாளர்,சுதந்திரமான/செயலிலுள்ள கட்டமைப்பு
-Comment[tg]=Танзимоти вақти озоди органайзери TDE
-Comment[tr]=KOrganizer Boş/Meşgul Yapılandırması
-Comment[uk]=Налаштування вільного/зайнятого часу в KOrganizer
-Comment[zh_CN]=KOrganizer 空闲/忙碌配置
-Comment[zh_TW]=KOrganizer 行程資訊設定
+
Keywords=korganizer;freebusy;scheduling;
-Keywords[af]=korganizer; freebusy; scheduling;
-Keywords[bg]=организатор; свободно; заето; настройки; korganizer; freebusy; scheduling;
-Keywords[bs]=korganizer;freebusy;scheduling;raspored;
-Keywords[ca]=korganizer;lliure ocupat;planificació;
-Keywords[cs]=korganizer;volný;zaneprázdněn;plánování;
-Keywords[cy]=korganizer;ktrefnydd;rhydd;prysur;trefnlennu;
-Keywords[da]=korganizer;fri/optaget;skemalægning;
-Keywords[de]=KOrganizer;Frei/Beschäftigt;Ablaufplanung;
-Keywords[el]=korganizer;freebusy;προγραμματισμός;
-Keywords[es]=korganizer;libreocupado;planificación;
-Keywords[et]=korganizer;vaba;hõivatud;ajakava;
-Keywords[eu]=korganizer;libre; lanpetuta;antolaketa;
-Keywords[fa]=korganizer،آزاد اشغال، زمان‌بندی;
-Keywords[fi]=korganizer;vapaa;varattu;ajastus;
-Keywords[fr]=KOrganizer;disponibilité; planification;
-Keywords[fy]=korganizer;freebusy;scheduling;plannen;frij;beset;roaster;
-Keywords[gl]=korganizer;dispoñibilidade;axenda;
-Keywords[hi]=के-आर्गेनाइज़र;फ्री-बिज़ी;समय-सारणी;
-Keywords[hu]=korganizer;foglaltság;szervezés;
-Keywords[is]=korganizer;tímaráðstöfun;áætlun;
-Keywords[it]=korganizer;libero/occupato;pianificazione;
-Keywords[ja]=korganizer;動静;スケジューラ;
-Keywords[km]=korganizer;ទំនេរ;រវល់;កាលវិភាគ;
-Keywords[mk]=korganizer;freebusy;scheduling;корганизатор;слободно;зафатено;закажување;
-Keywords[ms]=korganizer;lapang sibuk;penjadualan;
-Keywords[nb]=korganizer;ledigopptatt;planlegger;
-Keywords[nds]=KOrganizer;Free/Bunnen;Free;Bunnen;Planen;Plaan;
-Keywords[ne]=केडीई आयोजक; स्वतन्त्र व्यस्त; कार्यतालिका;
-Keywords[nl]=korganizer;freebusy;scheduling;plannen;vrij;bezet;rooster;
-Keywords[nn]=korganizer;ledigopptatt;planlegging;
-Keywords[pl]=korganizer;wolny/zajęty;planowanie;
-Keywords[pt]=korganizer;livre;ocupado;escalonamento;
-Keywords[pt_BR]=korganizer;livreocupado;agendamento;
-Keywords[ru]=korganizer;freebusy;scheduling;органайзер;занятое время;календарь;
-Keywords[sk]=korganizer;voľný čas;plánovanie;
-Keywords[sl]=korganizer;freebusy;razporejanje;
-Keywords[sr]=korganizer;freebusy;scheduling;слободан;заузет;планирање;
-Keywords[sr@Latn]=korganizer;freebusy;scheduling;slobodan;zauzet;planiranje;
-Keywords[sv]=korganizer;ledig/upptagen;schemaläggning;
-Keywords[ta]=கேஅமைப்பாளர்;சுதந்திரமான/திட்டம் அமைத்தல்;
-Keywords[tg]=korganizer;freebusy;scheduling;органайзер; вақти холӣ;ҷадвал;
-Keywords[tr]=korganizer;boş/meşgul;zamanlama;
-Keywords[uk]=korganizer;вільно;зайнято;час;розклад;
-Keywords[zh_CN]=korganizer;freebusy;scheduling;空闲;忙碌;日程安排;
diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop
index 95438a5e..4ccf4b82 100644
--- a/korganizer/korganizer_configgroupautomation.desktop
+++ b/korganizer/korganizer_configgroupautomation.desktop
@@ -12,150 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Group Automation
-Name[af]=Groep outomatisasie
-Name[bg]=Организация
-Name[bs]=Automatizacija grupe
-Name[ca]=Automatització de grups
-Name[cs]=Řízení skupiny
-Name[cy]=Ymysgogi Grŵp
-Name[da]=Gruppeautomation
-Name[de]=Gruppen-Automation
-Name[el]=Αυτοματισμός ομάδας
-Name[eo]=Grup-aŭtomatigo
-Name[es]=Automatización del grupo
-Name[et]=Grupitöö
-Name[eu]=Talde automatizazioa
-Name[fa]=خودکارسازی گروه
-Name[fi]=Ryhmän automatisointi
-Name[fr]=Automatisation des groupes
-Name[fy]=Groepautomatisearring
-Name[gl]=Automatización de Grupo
-Name[hi]=समूह स्वचालन
-Name[hu]=Csoportmunka
-Name[is]=Hópsjálfvirkni
-Name[it]=Automazione gruppi
-Name[ja]=グループ自動化
-Name[kk]=Топтың біріккен жұмысы
-Name[km]=ស្វ័យប្រតិកម្ម​ក្រុម
-Name[lt]=Grupių automatizavimas
-Name[mk]=Автоматизација на групи
-Name[ms]=Automasi Kumpulan
-Name[nb]=Gruppeautomat
-Name[nds]=Koppel-Akschonen
-Name[ne]=समूह स्वचालिकरण
-Name[nl]=Groepautomatisering
-Name[nn]=Gruppeautomatisering
-Name[pl]=Automatyzacja pracy grupowej
-Name[pt]=Automação do Grupo
-Name[pt_BR]=Automação de Grupo
-Name[ru]=Совместная работа
-Name[se]=Joavkoautomatiseren
-Name[sk]=Skupinová automatizácia
-Name[sl]=Avtomatizacija skupin
-Name[sr]=Аутоматизација група
-Name[sr@Latn]=Automatizacija grupa
-Name[sv]=Gruppautomation
-Name[ta]= குழு தானியங்கி
-Name[tg]=Кори гурӯҳӣ
-Name[tr]=Grup Otomasyonu
-Name[uk]=Автоматизація груп
-Name[zh_CN]=组自动化
-Name[zh_TW]=群組自動化
+
Comment=KOrganizer Group Automation Configuration
-Comment[af]=KOrganizer groep outomatisasie opstelling
-Comment[bg]=Настройки на организация за KOrganizer
-Comment[bs]=KOrganizer podešavanje automatizacije grupe
-Comment[ca]=Configuració de l'automatització de grups a KOrganizer
-Comment[cs]=Nastavení skupinového řízení KOrganizeru
-Comment[cy]=Ffurfweddiad Ymysgogi Grŵp KTrefnydd
-Comment[da]=KOrganizer gruppeautomation indstilling
-Comment[de]=Einrichtung von Gruppen-Automatismen für KOrganizer
-Comment[el]=Ρύθμιση αυτοματισμού ομάδας του KOrganizer
-Comment[eo]=KOrganizilo Grup-aŭtomatiga Agordo
-Comment[es]=Configuración del automatización del grupo de KOrganizer
-Comment[et]=KOrganizeri grupitöö seadistamine
-Comment[eu]=KOrganizer-en talde automatizazioaren konfigurazioa
-Comment[fa]=پیکربندی خودکارسازی گروه KOrganizer
-Comment[fi]=Korganizer ryhmän automatisoinnin asetukset
-Comment[fr]=Configuration de l'automatisation des groupes de KOrganizer
-Comment[fy]=KOrganizer groepautomatisearring ynstelle
-Comment[gl]=Configuración da Automatización de Grupo de KOrganizer
-Comment[hi]=के-आर्गेनाइज़र फ़ॉन्ट्स कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer csoportmunka-beállítások
-Comment[is]=Stillingar KOrganizer hópsjálfvirkni
-Comment[it]=Configurazione automazione gruppi di KOrganizer
-Comment[ja]=KOrganizer グループ自動化設定
-Comment[kk]=KOrganizer топтық жұмысының параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ស្វ័យប្រតិកម្ម​ក្រុម​របស់ KOrganizer
-Comment[lt]=KOrganizer grupių automatizavimo konfigūravimas
-Comment[mk]=Конфигурација на автоматизација на групи
-Comment[ms]=Konfigurasi Automasi Kumpulan KOrganizer
-Comment[nb]=KOrganizer oppsett for gruppeautomat
-Comment[nds]=Automaatsche Koppel-Akschonen för KOrganizer instellen
-Comment[ne]=केडीई आयोजक समूह स्वचालिकरण कन्फिगरेसन
-Comment[nl]=KOrganizer groepautomatisering instellen
-Comment[nn]=KOrganizer, innstillingar for gruppeautomatisering
-Comment[pl]=Konfiguracja automatyzacji pracy grupowej dla KOrganizera
-Comment[pt]=Configuração da Automação do Grupo do KOrganizer
-Comment[pt_BR]=Configuração de Automação de Grupo do KOrganizer
-Comment[ru]=Настройка совместной работы в органайзере TDE
-Comment[se]=KOrganizer, joavkoautomatiserema heivehusat
-Comment[sk]=Nastavenie skupinovej automatizácie pre KOrganizer
-Comment[sl]=Nastavitev avtomatizacije v KOrganizerju
-Comment[sr]=Подешавање аутоматизације група у KOrganizer-у
-Comment[sr@Latn]=Podešavanje automatizacije grupa u KOrganizer-u
-Comment[sv]=Inställning av Korganizers gruppautomation
-Comment[ta]=கேஅமைப்பாளர் குழு தானியங்கி கட்டமைப்பு
-Comment[tg]=Танзимоти кори гурӯҳӣ дар органайзер-TDE
-Comment[tr]=KOrganizer Grup Otomasyon Yapılandırması
-Comment[uk]=Налаштування автоматизації груп у KOrganizer
-Comment[zh_CN]=KOrganizer 组自动化配置
-Comment[zh_TW]=KOrganizer 群組自動化設定
+
Keywords=korganizer;group;automation;
-Keywords[af]=korganizer; group; automation;
-Keywords[bg]=организатор; организация; настройки; korganizer; group; automation;
-Keywords[bs]=korganizer;group;automation;automatizacija;grupa;grupe;
-Keywords[ca]=korganizer;grup;automatització;
-Keywords[cs]=korganizer;skupina;řízení;
-Keywords[cy]=korganizer;ktrefnydd;grŵp;ymysgogi;
-Keywords[da]=korganizer;gruppe;automation;
-Keywords[de]=KOrganizer;Gruppe;Automatisierung;
-Keywords[el]=korganizer;ομάδα;αυτοματοποίηση;
-Keywords[eo]=korganizilo;grupo;aŭtomatigo;
-Keywords[es]=korganizer;grupo;automatización;
-Keywords[et]=korganizer;grupid;grupitöö;
-Keywords[eu]=korganizer;taldea;automatizazioa;
-Keywords[fa]=korganizer،گروه، خودکارسازی;
-Keywords[fi]=korganizer;ryhmä;automaatio;
-Keywords[fr]=KOrganizer;groupes;automatisation;
-Keywords[fy]=korganizer;groep;automatisearring;
-Keywords[gl]=korganizer;grupo;automatización;
-Keywords[hi]=के-आर्गेनाइज़र;समूह;स्वचालन;
-Keywords[hu]=korganizer;csoport;csoportmunka;
-Keywords[is]=korganizer;hópar;sjálfvirkni;
-Keywords[it]=korganizer;gruppi;automazione;
-Keywords[ja]=korganizer;グループ;自動化;
-Keywords[km]=korganizer;ក្រុម;ស្វ័យប្រតិកម្ម;
-Keywords[lt]=korganizer;group;automation; grupės;automatizavimas;
-Keywords[mk]=korganizer;group;automation;корганизатор;група;групи;автоматизација;
-Keywords[ms]=korganizer;kumpulan;automasi;
-Keywords[nb]=korganizer;gruppe;automat;automatisering;
-Keywords[nds]=KOrganizer;Koppel;automaatsch;Akschoon;
-Keywords[ne]=केडीई आयोजक; समूह; स्वचालिकरण;
-Keywords[nl]=korganizer;groep;automatisering;
-Keywords[nn]=korganizer;gruppe;automatisering;
-Keywords[pl]=korganizer;grupy;praca grupowa;automatyzacja;
-Keywords[pt]=korganizer;grupo;automação;
-Keywords[pt_BR]=korganizer;grupo;automação;
-Keywords[ro]=korganizer;grup;automatizare;
-Keywords[ru]=korganizer;group;automation;совместная работа;органайзер;
-Keywords[sk]=korganizer;skupina;automatizácia;
-Keywords[sl]=korganizer;skupina;samodejnost;
-Keywords[sr]=korganizer;group;automation;група;аутоматизација;планер;
-Keywords[sr@Latn]=korganizer;group;automation;grupa;automatizacija;planer;
-Keywords[sv]=korganizer;grupp;automation;
-Keywords[ta]=கேஅமைப்பாளர்; குழு; தானியக்கம்;
-Keywords[tg]=korganizer;group;automation;кори гурӯҳӣ; органайзер;
-Keywords[tr]=korganizer;grup;otomasyon;
-Keywords[uk]=korganizer;група;автоматизація;
-Keywords[zh_CN]=korganizer;group;automation;组;自动化;
diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop
index 3a04de2e..c405d0b3 100644
--- a/korganizer/korganizer_configgroupscheduling.desktop
+++ b/korganizer/korganizer_configgroupscheduling.desktop
@@ -12,148 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Group Scheduling
-Name[af]=Groep Skedulering
-Name[ar]=جدولة المجموعة
-Name[bg]=Разписание
-Name[bs]=Raspoređivanje grupe
-Name[ca]=Planificació de grups
-Name[cs]=Skupinové plánování
-Name[cy]=Trefnlennu Grŵp
-Name[da]=Gruppeskemalægning
-Name[de]=Gruppenplanung
-Name[el]=Προγραμματισμός ομάδας
-Name[es]=Planificación de grupo
-Name[et]=Grupitöö ajakavad
-Name[eu]=Talde antolaketa
-Name[fa]=زمان‌بندی گروه
-Name[fi]=Ryhmän ajastus
-Name[fr]=Planification des tâches
-Name[fy]=Groepsplanning
-Name[gl]=Organización de Grupo
-Name[hi]=समूह समय-सारणी
-Name[hu]=Szervezés
-Name[is]=Hópáætlun
-Name[it]=Programmazione gruppi
-Name[ja]=グループスケジューリング
-Name[kk]=Топтың жұмысын жоспарлау
-Name[km]=រៀបចំ​កាលវិភាគ​ក្រុម
-Name[lt]=Grupių tvarkaraščių tvarkymas
-Name[mk]=Закажување групи
-Name[ms]=Penjadualan Kumpulan
-Name[nb]=Gruppeplanlegging
-Name[nds]=Koppelplanen
-Name[ne]=समूह कार्यतालिका
-Name[nl]=Groepsplanning
-Name[nn]=Gruppeplanlegging
-Name[pl]=Planowanie grupowe
-Name[pt]=Escalonamento do Grupo
-Name[pt_BR]=Agendamento de Grupo
-Name[ro]=Planificare grup
-Name[ru]=Календарь группы
-Name[se]=Joavkoplánen
-Name[sk]=Skupinové plánovanie
-Name[sl]=Razporejanje skupin
-Name[sr]=Распоређивање група
-Name[sr@Latn]=Raspoređivanje grupa
-Name[sv]=Gruppschemaläggning
-Name[ta]=குழு திட்ட வரையறை
-Name[tg]=Ҷадвали гурӯҳҳо
-Name[tr]=Group Zamanlama
-Name[uk]=Розклад груп
-Name[zh_CN]=组日程安排
-Name[zh_TW]=群組排程
+
Comment=KOrganizer Group Scheduling Configuration
-Comment[af]=KOrganizer groep skedulering opstelling
-Comment[ar]=إعداد جدولة مجموعة KOrganizer
-Comment[bg]=Настройки на разписание за KOrganizer
-Comment[bs]=KOrganizer podešavanje raspoređivanja grupe
-Comment[ca]=Configuració de la planificació de grups a KOrganizer
-Comment[cs]=Nastavení skupinového plánování KOrganizeru
-Comment[cy]=Ffurfweddiad Trefnlennu Grŵp KTrefnydd
-Comment[da]=KOrganizer gruppeskemalægning indstilling
-Comment[de]=Einrichtung von Gruppen-Planungen für KOrganizer
-Comment[el]=Ρύθμιση προγραμματισμού ομάδας του KOrganizer
-Comment[es]=Configuración de la planificación de grupos de KOrganizer
-Comment[et]=Korganizeri grupitöö ajakavade seadistamine
-Comment[eu]=KOrganizer-en talde antolaketaren konfigurazioa
-Comment[fa]=پیکربندی زمان‌بندی گروه KOrganizer
-Comment[fi]=KOrganizer ryhmäajastuksen asetukset
-Comment[fr]=Configuration de la planification des groupes de KOrganizer
-Comment[fy]=KOrganizer groepsplanning ynstelle
-Comment[gl]=Configuración da Axenda de Grupo de KOrganizer
-Comment[hi]=के-आर्गेनाइज़र समूह समय-सारणी कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer szervezési beállítások
-Comment[is]=Stillingar fyrir KOrganizer hópáætlun
-Comment[it]=Configurazione del programmatore gruppi di KOrganizer
-Comment[ja]=KOrganizer グループスケジューリング設定
-Comment[kk]=KOrganizer топтық жұмысты жоспрлаудың параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ការ​រៀបចំ​កាលវិភាគ​ក្រុម​របស់ KOrganizer
-Comment[lt]=KOrganizer grupių tvarkaraščių tvarkymo konfigūravimas
-Comment[mk]=Конфигурација на закажување групи
-Comment[ms]=Konfigurasi Penjadualan Kumpulan KOrganizer
-Comment[nb]=Gruppeplanleggingsoppsett for KOrganizer
-Comment[nds]=Koppelplanen för KOrganizer instellen
-Comment[ne]=केडीई आयोजक समूह कार्यतालिका कन्फिगरेसन
-Comment[nl]=KOrganizer groepsplanning instellen
-Comment[nn]=KOrganizer, innstillingar for gruppeplanlegging
-Comment[pl]=Konfiguracja planowania grupowego dla KOrganizera
-Comment[pt]=Configuração do Escalonamento do Grupo do KOrganizer
-Comment[pt_BR]=Configuração de Agendamento de Grupo do KOrganizer
-Comment[ru]=Настройка календаря группы органайзера TDE
-Comment[se]=KOrganizer, joavkoplánema heivehusat
-Comment[sk]=Nastavenie skupinového plánovania pre KOrganizer
-Comment[sl]=Nastavitev razporejanja skupin v KOrganizerju
-Comment[sr]=Подешавање распоређивања група у KOrganizer-у
-Comment[sr@Latn]=Podešavanje raspoređivanja grupa u KOrganizer-u
-Comment[sv]=Inställning av Korganizers gruppschemaläggning
-Comment[ta]=கேஅமைப்பாளர் குழு நேர அமைப்புக்கான கட்டமைப்பு
-Comment[tg]=Танзимоти ҷадвали гурӯҳҳои органайзер-TDE
-Comment[tr]=KOrganizer Grup Zamanlama Yapılandırması
-Comment[uk]=Налаштування групового розкладу в KOrganizer
-Comment[zh_CN]=Korganizer 组日程安排配置
-Comment[zh_TW]=KOrganizer 群組排程設定
+
Keywords=korganizer;group;scheduling;
-Keywords[bg]=организатор; разписание; настройки; korganizer; group; scheduling;
-Keywords[bs]=korganizer;group;scheduling;raspoređivanje;grupa;grupe;
-Keywords[ca]=korganizer;grup;planificació;
-Keywords[cs]=korganizer;skupina;plánování;
-Keywords[cy]=korganizer;ktrefnydd;grŵp;trefnlenni;
-Keywords[da]=korganizer;gruppe;skemalægning;
-Keywords[de]=KOrganizer;Gruppe;Planung;
-Keywords[el]=korganizer;ομάδα;προγραμματισμός;
-Keywords[es]=korganizer;grupo;planificación;
-Keywords[et]=korganizer;grupid;grupitöö;ajakavad;
-Keywords[eu]=korganizer;taldea;antolaketa;
-Keywords[fa]=korganizer،گروه، زمان‌بندی;
-Keywords[fi]=korganizer;ryhmä;ajastus;
-Keywords[fr]=KOrganizer;groupes;planification;
-Keywords[fy]=korganizer;group;scheduling;plannen;groep;
-Keywords[gl]=korganizer;grupo;programar;
-Keywords[hu]=korganizer;csoport;szervezés;
-Keywords[is]=korganizer;hóp;áætlun;
-Keywords[it]=korganizer;gruppo;programmazione;
-Keywords[ja]=korganizer;グループ;スケジューリング;
-Keywords[km]=korganizer;ក្រុម;កាលវិភាគ;
-Keywords[lt]=korganizer;group;scheduling;tvarkaraštis; grupė;
-Keywords[mk]=korganizer;group;scheduling;корганизатор;група;групи;закажување;
-Keywords[ms]=korganizer;kumpulan;penjadualan;
-Keywords[nb]=korganizer;gruppe;planlegging;
-Keywords[nds]=KOrganizer;Koppel;Plaan;planen;
-Keywords[ne]=केडीई आयोजक; समूह; कार्यतालिका;
-Keywords[nl]=korganizer;group;scheduling;plannen;groep;
-Keywords[nn]=korganizer;gruppe;planlegging;
-Keywords[pl]=korganizer;grupa;planowanie;
-Keywords[pt]=korganizer;grupo;escalonamento;
-Keywords[pt_BR]=korganizer;grupo;agendamento;
-Keywords[ro]=korganizer;grup;planificare;
-Keywords[ru]=korganizer;group;scheduling;календарь группы;органайзер;
-Keywords[sk]=korganizer;skupina;plánovanie;
-Keywords[sl]=korganizer;skupina;razporejanje;
-Keywords[sr]=korganizer;group;scheduling;планер;група;распоред;распоређивање;
-Keywords[sr@Latn]=korganizer;group;scheduling;planer;grupa;raspored;raspoređivanje;
-Keywords[sv]=korganizer;grupp;schemaläggning;
-Keywords[ta]=கேஅமைப்பாளர்;குழு; திட்டம் அமைத்தல்;
-Keywords[tg]=korganizer;group;scheduling;ҷадвалигурӯҳҳо;органайзер;
-Keywords[tr]=korganizer;grup;zamanlama;
-Keywords[uk]=korganizer;груп;розклад;
-Keywords[zh_CN]=korganizer;group;scheduling;组;日程安排;
diff --git a/korganizer/korganizer_configmain.desktop b/korganizer/korganizer_configmain.desktop
index dcbe82f3..46f547b2 100644
--- a/korganizer/korganizer_configmain.desktop
+++ b/korganizer/korganizer_configmain.desktop
@@ -12,157 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Personal
-Name[af]=Persoonlik
-Name[ar]=الشخصي
-Name[be]=Пэрсанальныя
-Name[bg]=Персоналност
-Name[br]=Diouzhoc'h
-Name[bs]=Lično
-Name[cs]=Osobní
-Name[cy]=Personol
-Name[da]=Personlig
-Name[de]=Persönliches
-Name[el]=Προσωπικό
-Name[eo]=Personaĵoj
-Name[et]=Isiklik
-Name[eu]=Pertsonala
-Name[fa]=شخصی
-Name[fi]=Henkilökohtainen
-Name[fr]=Personnel
-Name[fy]=Persoanlik
-Name[ga]=Pearsanta
-Name[gl]=Persoal
-Name[he]=אישי
-Name[hi]=निजी
-Name[hu]=Alapbeállítások
-Name[is]=Persónulegt
-Name[it]=Personale
-Name[ja]=個人設定
-Name[kk]=Дербес
-Name[km]=ផ្ទាល់​ខ្លួន
-Name[lt]=Suasmeninimas
-Name[mk]=Лично
-Name[ms]=Peribadi
-Name[nb]=Personlig
-Name[nds]=Persöönlich
-Name[ne]=व्यक्तिगत
-Name[nl]=Persoonlijk
-Name[nn]=Personleg
-Name[pl]=Osobiste
-Name[pt]=Pessoal
-Name[pt_BR]=Pessoal
-Name[ru]=Общие
-Name[se]=Peršuvnnalaš
-Name[sk]=Osobné
-Name[sl]=Osebno
-Name[sr]=Лично
-Name[sr@Latn]=Lično
-Name[sv]=Personlig inställning
-Name[ta]=அந்தரங்கமான
-Name[tg]=Танзимотҳои шахсӣ
-Name[tr]=Kişisel
-Name[uk]=Особисті
-Name[uz]=Шахсий
-Name[zh_CN]=个人
-Name[zh_TW]=個人
+
Comment=KOrganizer Main Configuration
-Comment[af]=KOrganizer hoof opstelling
-Comment[bg]=Главни настройки за KOrganizer
-Comment[br]=Kefluniadur kentañ KOrganizer
-Comment[bs]=KOrganizer glavno podešavanje
-Comment[ca]=Configuració principal a KOrganizer
-Comment[cs]=Hlavní nastavení KOrganizeru
-Comment[cy]=Prif Ffurfweddiad KTrefnydd
-Comment[da]=KOrganizer hovedindstilling
-Comment[de]=Grundeinrichtung für KOrganizer
-Comment[el]=Κύρια ρύθμιση του KOrganizer
-Comment[eo]=KOrganizilo-Ĉefagordo
-Comment[es]=Configuración principal de KOrganizer
-Comment[et]=KOrganizeri põhiseadistused
-Comment[eu]=KOrganizer-en konfigurazio nagusia
-Comment[fa]=پیکربندی اصلی KOrganizer
-Comment[fi]=KOrganizerin pääasetukset
-Comment[fr]=Configuration principale de KOrganizer
-Comment[fy]=KOrganizer algemiene ynstellings
-Comment[ga]=Príomhchumraíocht KOrganizer
-Comment[gl]=Configuración Principal de KOrganizer
-Comment[he]=תצורה ראשית של הארגונית
-Comment[hi]=के-आर्गेनाइज़र मुख्य कॉन्फ़िगरेशन
-Comment[hu]=A KOrganizer alapbeállításai
-Comment[is]=Aðalstillingar KOrganizer
-Comment[it]=Configurazione principale di KOrganizer
-Comment[ja]=KOrganizer 主要設定
-Comment[kk]=KOrganizer-дің негізгі параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​សំខាន់ៗ​របស់ KOrganizer
-Comment[lt]=KOrganizer bendroji konfigūravimas
-Comment[mk]=Главна конфигурација на КОрганизатор
-Comment[ms]=Konfigurasi Utama KOrganizer
-Comment[nb]=KOrganizer hovedoppsett
-Comment[nds]=Hööftinstellen för KOrganizer
-Comment[ne]=केडीई आयोजक मुख्य कन्फिगरेसन
-Comment[nl]=KOrganizer algemene instellingen
-Comment[nn]=KOrganizer, hovudinnstillingar
-Comment[pl]=Główna konfiguracja KOrganizera
-Comment[pt]=Configuração Principal do KOrganizer
-Comment[pt_BR]=Configuração Principal do KOrganizer
-Comment[ru]=Общие настройки органайзера TDE
-Comment[se]=Korganizer, váldoheivehusat
-Comment[sk]=Hlavné nastavenie KOrganizer
-Comment[sl]=Glavne nastavitve KOrganizerja
-Comment[sr]=Главна подешавања у KOrganizer-у
-Comment[sr@Latn]=Glavna podešavanja u KOrganizer-u
-Comment[sv]=Korganizers huvudinställning
-Comment[ta]=கேஅமைப்பாளர் முக்கிய கட்டமைப்பு
-Comment[tg]=Танзимотҳои умумии органайзер-TDE
-Comment[tr]=KOrganizer Temel Yapılandırması
-Comment[uk]=Налаштування особистих даних у KOrganizer
-Comment[zh_CN]=KOrganizer 主要配置
-Comment[zh_TW]=KOrganizer 主設定
+
Keywords=korganizer;main;personal;
-Keywords[bg]=организатор; главни; персонални; настройки; korganizer; main; personal;
-Keywords[bs]=korganizer;main;personal;lično;
-Keywords[ca]=korganizer;principal;personal;
-Keywords[cs]=korganizer;hlavní;osobní;
-Keywords[cy]=korganizer;ktrefnydd;prif;personol;
-Keywords[da]=korganizer;hoved;personlig;
-Keywords[de]=KOrganizer;Persönliches;
-Keywords[el]=korganizer;κύρια;προσωπικό;
-Keywords[es]=korganizer;principal;personal;
-Keywords[et]=korganizer;peamine;isiklik;
-Keywords[eu]=korganizer;nagusia;pertsonala;
-Keywords[fa]=korganizer،اصلی، شخصی;
-Keywords[fi]=korganizer;pää;henkilökohtainen;
-Keywords[fr]=KOrganizer;principal;personnel;
-Keywords[fy]=korganizer;algemien; persoanlik;
-Keywords[gl]=korganizer;principal;persoal;
-Keywords[he]=korganizer;main;personal;ארגונית;תצורה;הגדרה;הגדרות;
-Keywords[hi]=के-आर्गेनाइज़र;मुख्य;निजी;
-Keywords[hu]=korganizer;alapbeállítások;személyes;
-Keywords[is]=korganizer;aðal;persónulegt;
-Keywords[it]=korganizer;principale;personale;
-Keywords[ja]=korganizer;メイン;個人;
-Keywords[km]=korganizer;សំខាន់;ផ្ទាល់​ខ្លួន;
-Keywords[lt]=korganizer;main;personal;pagrindinis;asmeninis;bendroji;
-Keywords[mk]=korganizer;main;personal;корганизатор;главно;лично;
-Keywords[ms]=korganizer;utama;peribadi;
-Keywords[nb]=korganizer;hoved;personlig;
-Keywords[nds]=KOrganizer;hööft;persöönlich;instellen;hööftinstellen;
-Keywords[ne]=केडीई आयोजक; मुख्य; व्यक्तिगत;
-Keywords[nl]=korganizer;algemeen;persoonlijk;
-Keywords[nn]=korganizer;hovud;personleg;
-Keywords[pl]=korganizer;główny;główna;osobisty;osobista;osobiste;
-Keywords[pt]=korganizer;principal;pessoal;
-Keywords[pt_BR]=korganizer;principal;pessoal;
-Keywords[ro]=korganizer;principal;personal;
-Keywords[ru]=korganizer;main;personal;почта;персональные настройки;органайзер;
-Keywords[sk]=korganizer;hlavné;osobné;
-Keywords[sl]=korganizer;glavne;osebne;
-Keywords[sr]=korganizer;main;personal;планер;главни;лични;лично;
-Keywords[sr@Latn]=korganizer;main;personal;planer;glavni;lični;lično;
-Keywords[sv]=korganizer;huvudinställning;personlig inställning;
-Keywords[ta]=கேஅமைப்பாளர்;முக்கிய; தனிப்பட்ட;
-Keywords[tg]=korganizer;main;personal;почта;танзимотҳои шахсӣ;органайзер;
-Keywords[tr]=korganizer;temel;kişisel;
-Keywords[uk]=korganizer;особистий;Персональний;
-Keywords[uz]=korganizer;органайзер;асосий;шахсий;
-Keywords[zh_CN]=korganizer;main;personal;主要;个人;
diff --git a/korganizer/korganizer_configplugins.desktop b/korganizer/korganizer_configplugins.desktop
index 563f3b72..3a3d23f7 100644
--- a/korganizer/korganizer_configplugins.desktop
+++ b/korganizer/korganizer_configplugins.desktop
@@ -12,141 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Plugins
-Name[af]=Inprop modules
-Name[ar]=القوابس
-Name[be]=Дапаўненні
-Name[bg]=Приставки
-Name[br]=Lugantoù
-Name[ca]=Endollables
-Name[cs]=Moduly
-Name[cy]=Ategion
-Name[da]=Plugin
-Name[de]=Module
-Name[el]=Πρόσθετα
-Name[eo]=Kromaĵoj
-Name[es]=Extensiones
-Name[et]=Pluginad
-Name[eu]=Plugin-ak
-Name[fa]=وصله‌ها
-Name[fi]=Liitännäiset
-Name[fr]=Modules externes
-Name[ga]=Breiseáin
-Name[gl]=Extensións
-Name[he]=תוספים
-Name[hu]=Bővítőmodulok
-Name[is]=Íforrit
-Name[it]=Plugin
-Name[ja]=プラグイン
-Name[kk]=Плагин модульдері
-Name[km]=កម្មវិធី​ជំនួយ
-Name[lt]=Priedai
-Name[mk]=Приклучоци
-Name[ms]=Plugin
-Name[nb]=Programtillegg
-Name[nds]=Modulen
-Name[ne]=प्लगइन
-Name[nn]=Programtillegg
-Name[pl]=Wtyczki
-Name[pt]='Plugins'
-Name[ru]=Модули
-Name[rw]=Amacomeka
-Name[sk]=Moduly
-Name[sl]=Vstavki
-Name[sr]=Прикључци
-Name[sr@Latn]=Priključci
-Name[sv]=Insticksprogram
-Name[ta]=சொருகுப்பொருள்கள்
-Name[tr]=Eklentiler
-Name[uk]=Втулки
-Name[uz]=Плагинлар
-Name[zh_CN]=插件
-Name[zh_TW]=外掛程式
+
Comment=KOrganizer Plugin Configuration
-Comment[af]=Korganizer inprop module opstelling
-Comment[be]=Канфігурацыя дапаўненняў "K Арганізатара"
-Comment[bg]=Настройки на приставките за KOrganizer
-Comment[br]=Kefluniadur al lugent KOrganizer
-Comment[ca]=Configuració de l'endollable de KOrganizer
-Comment[cs]=Nastavení modulů KOrganizeru
-Comment[da]=KOrganizer plugin-indstilling
-Comment[de]=Modul-Einrichtung für KOrganizer
-Comment[el]=Ρύθμιση προσθέτων του KOrganizer
-Comment[eo]=KOrganizilo-Kromaĵagordo
-Comment[es]=Configuración de las extensiones de KOrganizer
-Comment[et]=KOrganizeri pluginate seadistused
-Comment[eu]=KOrganizer-en plugin konfigurazioa
-Comment[fa]=پیکربندی وصلۀ KOrganizer
-Comment[fi]=KOrganizerin liitännäisen asetukset
-Comment[fr]=Configuration du module KOrganizer
-Comment[fy]=KOrganizer pluginynstellings
-Comment[gl]=Configuración de Extensións de KOrganizer
-Comment[he]=הגדרות תוסף הארגונית
-Comment[hu]=A KOrganizer bővítőmodul beállításai
-Comment[is]=Stillingar KOrganizer íforrita
-Comment[it]=Configurazione plugin KOrganizer
-Comment[ja]=KOrganizer プラグイン設定
-Comment[kk]=KOrganizer-дің плагин модульдерінің параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ជំនួយ KOrganizer
-Comment[lt]=KOrganizer priedų konfigūravimas
-Comment[mk]=Конфигурација на приклучоци
-Comment[ms]=Konfigurasi Plugin KOrganizer
-Comment[nb]=KOrganizer oppsett for programtillegg
-Comment[nds]=Modulen för KOrganizer instellen
-Comment[ne]=केडीई आयोजक प्लगइन कन्फिगरेसन
-Comment[nl]=KOrganizer plugininstellingen
-Comment[nn]=Oppsett av KOrganizer-programtillegg
-Comment[pl]=Konfiguracja wtyczek KOrganizera
-Comment[pt]=Configuração de 'Plugins' do KOrganizer
-Comment[pt_BR]=Configuração dos Plug-ins do KOrganizer
-Comment[ru]=Настройки модуля KOrganizer
-Comment[sk]=Nastavenie modulu KOrganizer
-Comment[sl]=Nastavitve vstavka KOrganizerja
-Comment[sr]=Подешавање прикључака KOrganizer-а
-Comment[sr@Latn]=Podešavanje priključaka KOrganizer-a
-Comment[sv]=Korganizers inställning av insticksprogram
-Comment[ta]=கேஅமைப்பாளர் சொருகுப்பொருள் வடிவமைப்பு
-Comment[tr]=KOrganizer Eklenti Yapılandırması
-Comment[uk]=Втулок налаштування KOrganizer
-Comment[zh_CN]=KOrganizer 插件配置
-Comment[zh_TW]=KOrganizer外掛程式設定
+
Keywords=korganizer;plugin;module;
-Keywords[be]=K Арганізатар;дапаўненне;модуль;korganizer;plugin;module;
-Keywords[bg]=организатор; модул; приставка; korganizer; plugin; module;
-Keywords[ca]=korganizer;endollable;mòdul;
-Keywords[cs]=korganizer;modul;
-Keywords[da]=korganizer;plugin;modul;
-Keywords[de]=KOrganizer;Modul;Plugin;
-Keywords[el]=korganizer;πρόσθετο;άρθρωμα;
-Keywords[es]=korganizer;extensión;plugin;módulo;
-Keywords[et]=korganizer;plugin;moodul;
-Keywords[eu]=korganizer;plugin-a;modulua;
-Keywords[fa]=korganizer،وصله، پیمانه;
-Keywords[fi]=korganizer;liitännäinen;moduuli;
-Keywords[fr]=KOrganizer;module;
-Keywords[ga]=korganizer;breiseán;modúl;
-Keywords[gl]=korganizer;extensión;módulo;
-Keywords[he]=korganizer;plugin;module;מודול;תוסף;ארגונית;
-Keywords[hu]=korganizer;bővítőmodul;modul;
-Keywords[is]=korganizer;íforrit;eining;
-Keywords[it]=korganizer;plugin;modulo;
-Keywords[ja]=korganizer;プラグイン;モジュール;
-Keywords[km]=korganizer;កម្មវិធី​ជំនួយ;ម៉ូឌុល;
-Keywords[lt]=korganizer;plugin;module;modulis;priedas;
-Keywords[mk]=korganizer;plugin;module;корганизатор;приклучок;приклучоци;модул.модули;
-Keywords[ms]=korganizer;plugin;modul;
-Keywords[nb]=korganizer;programtillegg;modul;
-Keywords[nds]=KOrganizer;Moduul;Modulen;Plugins;
-Keywords[ne]=केडीई आयोजक; प्लगइन; मोड्युल;
-Keywords[nn]=korganizer;programtillegg;modul;
-Keywords[pl]=korganizer;wtyczka;moduł;
-Keywords[pt]=korganizer;'plugin';módulo;
-Keywords[pt_BR]=korganizer;plugin;módulo;
-Keywords[ru]=korganizer;plugin;module;органайзер;модуль;
-Keywords[sl]=korganizer;vstavek;modul;
-Keywords[sr]=korganizer;plugin;module;прикључак;модул;
-Keywords[sr@Latn]=korganizer;plugin;module;priključak;modul;
-Keywords[sv]=korganizer;insticksprogram;modul;
-Keywords[ta]=கேஅமைப்பாளர்;சொருகுப்பொருள்;பகுதி;
-Keywords[tr]=korganizer;eklenti;modül;
-Keywords[uk]=korganizer;plugin;module;втулок;модуль;
-Keywords[zh_CN]=korganizer;plugin;module;插件;模块;
diff --git a/korganizer/korganizer_configtime.desktop b/korganizer/korganizer_configtime.desktop
index 8aadcc77..80af8142 100644
--- a/korganizer/korganizer_configtime.desktop
+++ b/korganizer/korganizer_configtime.desktop
@@ -12,164 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Time & Date
-Name[af]=Datum & Tyd
-Name[ar]=الوقت و التاريخ
-Name[be]=Час і дата
-Name[bg]=Дата и час
-Name[br]=Deiziad hag eur
-Name[bs]=Vrijeme i datum
-Name[ca]=Hora i data
-Name[cs]=Datum a čas
-Name[cy]=Amser & Dyddiad
-Name[da]=Tid & Dato
-Name[de]=Zeit & Datum
-Name[el]=Ώρα & Ημερομηνία
-Name[eo]=Tempo & Dato
-Name[es]=Fecha y hora
-Name[et]=Aeg
-Name[eu]=Ordua eta data
-Name[fa]=زمان و تاریخ
-Name[fi]=Aika ja päiväys
-Name[fr]=Date et heure
-Name[fy]=Datum & tiid
-Name[ga]=Am & Dáta
-Name[gl]=Hora e Data
-Name[he]=תאריך ושעה
-Name[hi]=तारीख़ व समय
-Name[hu]=Dátum és idő
-Name[is]=Tími og dagsetning
-Name[it]=Data e ora
-Name[ja]=日付と時間
-Name[kk]=Уақыт пен Күн
-Name[km]=កាលបរិច្ឆេទ & ពេលវេលា
-Name[lt]=Laikas ir data
-Name[mk]=Датуми и времиња
-Name[ms]=Waktu & Tarikh
-Name[nb]=Dato og klokkeslett
-Name[nds]=Tiet & Datum
-Name[ne]=मिति र समय
-Name[nl]=Datum & tijd
-Name[nn]=Tidsinnstillingar
-Name[pl]=Czas i data
-Name[pt]=Data e Hora
-Name[pt_BR]=Data & Hora
-Name[ro]=Timp şi dată
-Name[ru]=Дата и время
-Name[se]=Áigi ja beaivvit
-Name[sk]=Dátum a čas
-Name[sl]=Čas in datum
-Name[sr]=Време и датум
-Name[sr@Latn]=Vreme i datum
-Name[sv]=Tid och datum
-Name[ta]=நேரம் & தேதி
-Name[tg]=Сана ва вақт
-Name[tr]=Saat & Tarih
-Name[uk]=Час та дата
-Name[uz]=Сана ва вақт
-Name[zh_CN]=时间和日期
-Name[zh_TW]=時間與日期
+
Comment=KOrganizer Time Configuration
-Comment[af]=KOrganizer tyd opstelling
-Comment[ar]=إعداد الوقت لِــ KOrganizer
-Comment[be]=Канфігурацыя часу "K Арганізатара"
-Comment[bg]=Настройки на дата и час за KOrganizer
-Comment[bs]=KOrganizer podešavanje vremena
-Comment[ca]=Configuració del temps a KOrganizer
-Comment[cs]=Nastavení času v KOrganizeru
-Comment[cy]=Ffurfweddiad Amser KTrefnydd
-Comment[da]=KOrganizer tidsindstilling
-Comment[de]=Zeitliche Vorgaben für KOrganizer
-Comment[el]=Ρύθμιση ώρας του KOrganizer
-Comment[eo]=KOrganizilo-tempagordo
-Comment[es]=Configuración de la hora de KOrganizer
-Comment[et]=KOrganizeri ajaseadistused
-Comment[eu]=KOrganizer-en ordu/data konfigurazioa
-Comment[fa]=پیکربندی زمان KOrganizer
-Comment[fi]=KOrganizerin aika-asetukset
-Comment[fr]=Configuration de l'heure de KOrganizer
-Comment[fy]=KOrganizer datum en tiid ynstelle
-Comment[gl]=Configuración de Hora de KOrganizer
-Comment[he]=הגדרות שעה בארגונית
-Comment[hi]=के-आर्गेनाइज़र समय कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer dátum- és időbeállítások
-Comment[is]=KOrganizer tímastillingar
-Comment[it]=Configurazione data di KOrganizer
-Comment[ja]=KOrganizer 時間設定
-Comment[kk]=KOrganizer-дің уақыт параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ពេលវេលា​របស់ KOrganizer
-Comment[lt]=KOrganizer laiko konfigūravimas
-Comment[mk]=Конфигурација на датуми и времиња
-Comment[ms]=Konfigurasi Waktu KOrganizer
-Comment[nb]=KOrganizer tidsoppsett
-Comment[nds]=Tietinstellen för KOrganizer
-Comment[ne]=केडीई आयोजक समय कन्फिगरेसन
-Comment[nl]=KOrganizer datum en tijd instellen
-Comment[nn]=KOrganizer, tidsinnstillingar
-Comment[pl]=Konfiguracja czasu dla KOrganizera
-Comment[pt]=Configuração da Hora no KOrganizer
-Comment[pt_BR]=Configuração de Tempo do KOrganizer
-Comment[ro]=Configurare timp KOrganizer
-Comment[ru]=Настройка времени органайзера TDE
-Comment[sk]=Nastavenie času pre KOrganizer
-Comment[sl]=Nastavitev časa v KOrganizerju
-Comment[sr]=Подешавање времена у KOrganizer-у
-Comment[sr@Latn]=Podešavanje vremena u KOrganizer-u
-Comment[sv]=Inställning av Korganizers tid
-Comment[ta]=கேஅமைப்பாளர் நேர கட்டமைப்பு
-Comment[tg]=Танзимоти вақти органайзери TDE
-Comment[tr]=KOrganizer Zaman Yapılandırması
-Comment[uk]=Налаштування часу та дати в KOrganizer
-Comment[zh_CN]=KOrganizer 时间配置
-Comment[zh_TW]=KOrganizer 時間設定
+
Keywords=korganizer;time;
-Keywords[be]=K Арганізатар;час;korganizer;time;
-Keywords[bg]=организатор; дата; час; настройки; korganizer; time;
-Keywords[br]=korganizer;amzer;
-Keywords[bs]=korganizer;time;vrijeme;
-Keywords[ca]=korganizer;temps;
-Keywords[cs]=korganizer;čas;
-Keywords[cy]=korganizer;ktrefnydd;amser;
-Keywords[da]=korganizer;tid;
-Keywords[de]=KOrganizer;Zeit;
-Keywords[el]=korganizer;ώρα;
-Keywords[eo]=korganizilo;tempo;
-Keywords[es]=korganizer;hora;
-Keywords[et]=korganizer;aeg;
-Keywords[eu]=korganizer;ordua;data;
-Keywords[fa]=korganizer،زمان;
-Keywords[fi]=korganizer;aika;
-Keywords[fr]=KOrganizer;date;
-Keywords[fy]=datum;tijd;tiid;korganizer;
-Keywords[ga]=korganizer;am;
-Keywords[gl]=korganizer;hora;
-Keywords[he]=korganizer;time;ארגונית;שעה;
-Keywords[hi]=के-आर्गेनाइज़र;समय;
-Keywords[hu]=korganizer;idő;
-Keywords[is]=korganizer;tími;
-Keywords[it]=korganizer;data;ora;
-Keywords[ja]=korganizer;時間;
-Keywords[km]=korganizer;ពេលវេលា;
-Keywords[lt]=korganizer;time;laikas;
-Keywords[mk]=korganizer;time;корганизатор;датум;време;
-Keywords[ms]=korganizer;waktu;
-Keywords[nb]=korganizer;tid;
-Keywords[nds]=KOrganizer;Tiet;
-Keywords[ne]=केडीई आयोजक; समय;
-Keywords[nl]=datum;tijd;korganizer;
-Keywords[nn]=korganizer;tid;
-Keywords[pl]=korganizer;czas;data;daty;
-Keywords[pt]=korganizer;hora;
-Keywords[pt_BR]=korganizer;tempo;
-Keywords[ro]=korganizer;timp;
-Keywords[ru]=korganizer;time;органайзер;время;
-Keywords[sk]=korganizer;čas;
-Keywords[sl]=korganizer;čas;
-Keywords[sr]=korganizer;time;време;планер;
-Keywords[sr@Latn]=korganizer;time;vreme;planer;
-Keywords[sv]=korganizer;tid;
-Keywords[ta]=கேஅமைப்பாளர்;நேரம்;
-Keywords[tg]=korganizer;time;органайзер;вақт;
-Keywords[tr]=korganizer;zaman;
-Keywords[uk]=korganizer;час;дата;
-Keywords[uz]=korganizer;органайзер;сана;вақт;
-Keywords[zh_CN]=korganizer;time;时间;
diff --git a/korganizer/korganizer_configviews.desktop b/korganizer/korganizer_configviews.desktop
index bbef1c1f..05c073e3 100644
--- a/korganizer/korganizer_configviews.desktop
+++ b/korganizer/korganizer_configviews.desktop
@@ -12,159 +12,7 @@ X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
X-TDE-CfgDlgHierarchy=KOrganizer
Name=Views
-Name[af]=Aansigte
-Name[ar]=العروض
-Name[be]=Выгляды
-Name[bg]=Изгледи
-Name[br]=Gweloù
-Name[bs]=Pogledi
-Name[ca]=Vistes
-Name[cs]=Pohledy
-Name[cy]=Golygon
-Name[da]=Visninger
-Name[de]=Ansichten
-Name[el]=Προβολές
-Name[eo]=Rigardoj
-Name[es]=Vistas
-Name[et]=Vaated
-Name[eu]=Ikuspegiak
-Name[fa]=نماها
-Name[fi]=Näkymät
-Name[fr]=Vues
-Name[fy]=Werjeften
-Name[ga]=Amhairc
-Name[gl]=Vistas
-Name[he]=תצוגות
-Name[hi]=दृश्य
-Name[hu]=Nézetek
-Name[is]=Sýn
-Name[it]=Viste
-Name[ja]=ビューア
-Name[kk]=Көріністері
-Name[km]=ទិដ្ឋភាព
-Name[lt]=Žiūrikliai
-Name[mk]=Приказ
-Name[ms]=Paparan
-Name[nb]=Visninger
-Name[nds]=Ansichten
-Name[ne]=दृश्य
-Name[nl]=Weergaven
-Name[nn]=Visingar
-Name[pl]=Widoki
-Name[pt]=Janelas
-Name[pt_BR]=Visões
-Name[ro]=Vizualizări
-Name[ru]=Вид
-Name[se]=Čájeheamit
-Name[sk]=Pohľady
-Name[sl]=Prikazi
-Name[sr]=Прикази
-Name[sr@Latn]=Prikazi
-Name[sv]=Vyer
-Name[ta]=காட்சிகள்
-Name[tg]=Намудҳо
-Name[tr]=Görünümler
-Name[uk]=Перегляди
-Name[uz]=Кўринишлар
-Name[zh_CN]=视图
-Name[zh_TW]=檢視
+
Comment=KOrganizer View Configuration
-Comment[af]=KOrganizer aansig opstelling
-Comment[be]=Канфігурацыя выгляду "K Арганізатара"
-Comment[bg]=Настройки на изгледи за KOrganizer
-Comment[bs]=KOrganizer podešavanje pogleda
-Comment[ca]=Configuració de la vista a KOrganizer
-Comment[cs]=Nastavení pohledů KOrganizeru
-Comment[cy]=Ffurfweddiad Golygon KTrefnydd
-Comment[da]=KOrganizer visningsindstilling
-Comment[de]=Ansichts-Einstellungen für KOrganizer
-Comment[el]=Ρύθμιση προβολής του KOrganizer
-Comment[eo]=KOrganizilo-Rigardagordo
-Comment[es]=Configuración de la vista de KOrganizer
-Comment[et]=KOrganizeri vaateseadistused
-Comment[eu]=KOrganizer-en ikuspegi konfigurazioa
-Comment[fa]=پیکربندی نمای KOrganizer
-Comment[fi]=KOrganizerin näkymäasetukset
-Comment[fr]=Configuration des vues de KOrganizer
-Comment[fy]=KOrganizer werjefte ynstelle
-Comment[gl]=Configuración de Vista de KOrganizer
-Comment[hi]=के-आर्गेनाइज़र दृश्य कॉन्फ़िगरेशन
-Comment[hu]=KOrganizer nézeti beállítások
-Comment[is]=Stillingar KOrganizer sýna
-Comment[it]=Configurazione viste di KOrganizer
-Comment[ja]=KOrganizer ビューア設定
-Comment[kk]=KOrganizer-дің көрінісінің параметрлері
-Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ទិដ្ឋភាព​របស់ KOrganizer
-Comment[lt]=KOrganizer žiūriklių konfigūravimas
-Comment[mk]=Конфигурација на приказот
-Comment[ms]=Konfigurasi Paparan KOrganizer
-Comment[nb]=KOrganizer visningsoppsett
-Comment[nds]=Ansichteninstellen för KOrganizer
-Comment[ne]=केडीई आयोजक दृश्य कन्फिगरेसन
-Comment[nl]=KOrganizer weergave instellen
-Comment[nn]=KOrganizer, visingsinnstillingar
-Comment[pl]=Konfiguracja widoków KOrganizera
-Comment[pt]=Configuração da Janela do KOrganizer
-Comment[pt_BR]=Configuração de Visões do KOrganizer
-Comment[ru]=Настройка видов органайзера TDE
-Comment[sk]=Nastavenie pohľadov pre KOrganizer
-Comment[sl]=Nastavitev prikaza KOrganizerja
-Comment[sr]=Подешавање приказа у KOrganizer-у
-Comment[sr@Latn]=Podešavanje prikaza u KOrganizer-u
-Comment[sv]=Inställning av Korganizers vyer
-Comment[ta]=கேஅமைப்பாளர் காட்சி கட்டமைப்பு
-Comment[tg]=Танзимоти намудҳои органайзери TDE
-Comment[tr]=KOrganizer Görünüm Yapılandırması
-Comment[uk]=Налаштування переглядів у KOrganizer
-Comment[zh_CN]=KOrganizer 视图配置
-Comment[zh_TW]=KOrganizer 檢視設定
+
Keywords=korganizer;view;
-Keywords[be]=K Арганізатар;выгляд;korganizer;view;
-Keywords[bg]=организатор; изглед; изгледи; настройки; korganizer; view;
-Keywords[br]=korganizer;gwell;
-Keywords[bs]=korganizer;view;pogled;
-Keywords[ca]=korganizer;vista;
-Keywords[cs]=korganizer;pohled;
-Keywords[cy]=korganizer;ktrefnydd;golwg;
-Keywords[da]=korganizer;visning;
-Keywords[de]=KOrganizer;Ansicht;
-Keywords[el]=korganizer;προβολή;
-Keywords[eo]=korganizilo;rigardo;
-Keywords[es]=korganizer;vista;
-Keywords[et]=korganizer;vaade;
-Keywords[eu]=korganizer;ikuspegia;
-Keywords[fa]=korganizer،نما;
-Keywords[fi]=korganizer;näkymä;
-Keywords[fr]=KOrganizer;vues;
-Keywords[fy]=korganizer;weergave; werjefte;
-Keywords[ga]=korganizer;amharc;
-Keywords[gl]=korganizer;vista;
-Keywords[hi]=के-आर्गेनाइज़र;दृश्य;
-Keywords[hu]=korganizer;nézet;
-Keywords[is]=korganizer;sýn;
-Keywords[it]=korganizer;viste;
-Keywords[km]=korganizer;ទិដ្ឋភាព;
-Keywords[lt]=korganizer;view;žiūrikliai;
-Keywords[mk]=korganizer;view;корганизатор;приказ;
-Keywords[ms]=korganizer;paparan;
-Keywords[nb]=korganizer;visning;
-Keywords[nds]=KOrganizer;Ansichten;
-Keywords[ne]=केडीई आयोजक; दृश्य;
-Keywords[nl]=korganizer;weergave;
-Keywords[nn]=korganizer;vising;
-Keywords[pl]=korganizer;widok;
-Keywords[pt]=korganizer;janela;
-Keywords[pt_BR]=korganizer;visão;
-Keywords[ro]=korganizer;vizualizare;
-Keywords[ru]=korganizer;view;органайзер;виды;
-Keywords[sk]=korganizer;pohľad;zobrazenie;
-Keywords[sl]=korganizer;prikaz;
-Keywords[sr]=korganizer;view;планер;приказ;
-Keywords[sr@Latn]=korganizer;view;planer;prikaz;
-Keywords[sv]=korganizer;vy;
-Keywords[ta]=கேஅமைப்பாளர்;காட்சி;
-Keywords[tg]=korganizer;view;органайзер;намудҳо;
-Keywords[tr]=korganizer;görünüm;
-Keywords[uk]=korganizer;перегляд;
-Keywords[uz]=korganizer;органайзер;кўриниш;
-Keywords[zh_CN]=korganizer;view;视图;
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 1b607169..ab1b3c12 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -81,7 +81,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( parentWidget, widgetName );
- canvas->setFocusPolicy( TQ_ClickFocus );
+ canvas->setFocusPolicy( TQWidget::ClickFocus );
setWidget( canvas );
mView = new CalendarView( canvas );
@@ -109,10 +109,10 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
KParts::InfoExtension *ie = new KParts::InfoExtension( this,
"KOrganizerInfo" );
- connect( mView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- TQT_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) );
- connect( this, TQT_SIGNAL( textChanged( const TQString & ) ),
- ie, TQT_SIGNAL( textChanged( const TQString & ) ) );
+ connect( mView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ TQ_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) );
+ connect( this, TQ_SIGNAL( textChanged( const TQString & ) ),
+ ie, TQ_SIGNAL( textChanged( const TQString & ) ) );
mActionManager->init();
mActionManager->readSettings();
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 21e96462..e4d33902 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -56,7 +56,7 @@ class TQDate;
class KOrganizerPart: public KParts::ReadOnlyPart,
public KOrg::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 4873ef63..c91a715e 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -34,7 +34,7 @@
#include "korganizeriface.h"
#include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class ActionManager;
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index a93c6d68..fc2bf0cf 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -62,18 +62,18 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent,
vbox->addWidget( mGantt );
- connect( mGantt, TQT_SIGNAL(gvCurrentChanged(KDGanttViewItem*)),
- TQT_SLOT(itemSelected(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(itemDoubleClicked(KDGanttViewItem*)),
- TQT_SLOT(itemDoubleClicked(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(itemRightClicked(KDGanttViewItem*)),
- TQT_SLOT(itemRightClicked(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(gvItemMoved(KDGanttViewItem*)),
- TQT_SLOT(itemMoved(KDGanttViewItem*)) );
- connect( mGantt, TQT_SIGNAL(rescaling(KDGanttView::Scale)),
- TQT_SLOT(overscale(KDGanttView::Scale)) );
- connect( mGantt, TQT_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ),
- TQT_SLOT( newEventWithHint( const TQDateTime& ) ) );
+ connect( mGantt, TQ_SIGNAL(gvCurrentChanged(KDGanttViewItem*)),
+ TQ_SLOT(itemSelected(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(itemDoubleClicked(KDGanttViewItem*)),
+ TQ_SLOT(itemDoubleClicked(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(itemRightClicked(KDGanttViewItem*)),
+ TQ_SLOT(itemRightClicked(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(gvItemMoved(KDGanttViewItem*)),
+ TQ_SLOT(itemMoved(KDGanttViewItem*)) );
+ connect( mGantt, TQ_SIGNAL(rescaling(KDGanttView::Scale)),
+ TQ_SLOT(overscale(KDGanttView::Scale)) );
+ connect( mGantt, TQ_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ),
+ TQ_SLOT( newEventWithHint( const TQDateTime& ) ) );
}
KOTimelineView::~KOTimelineView()
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 2d0e7c0d..0e131897 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -43,7 +43,7 @@ namespace KOrg {
*/
class KOTimelineView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTimelineView(Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 9da33659..3a41d1ff 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -68,21 +68,21 @@ void KOTodoEditor::init()
setupRecurrence();
setupAttendeesTab();
- connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ),
- mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) );
- connect( mGeneral, TQT_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ),
- mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
+ connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ),
+ mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) );
+ connect( mGeneral, TQ_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ),
+ mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) );
- connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ),
- TQT_SIGNAL( editCategories() ) );
+ connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ),
+ TQ_SIGNAL( editCategories() ) );
- connect( mDetails, TQT_SIGNAL(updateAttendeeSummary(int)),
- mGeneral, TQT_SLOT(updateAttendeeSummary(int)) );
+ connect( mDetails, TQ_SIGNAL(updateAttendeeSummary(int)),
+ mGeneral, TQ_SLOT(updateAttendeeSummary(int)) );
- connect( mGeneral, TQT_SIGNAL(editRecurrence()),
- mRecurrenceDialog, TQT_SLOT(show()) );
- connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()),
- TQT_SLOT(updateRecurrenceSummary()) );
+ connect( mGeneral, TQ_SIGNAL(editRecurrence()),
+ mRecurrenceDialog, TQ_SLOT(show()) );
+ connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()),
+ TQ_SLOT(updateRecurrenceSummary()) );
}
void KOTodoEditor::reload()
@@ -94,7 +94,7 @@ void KOTodoEditor::reload()
void KOTodoEditor::setupGeneral()
{
- mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this));
+ mGeneral = new KOEditorGeneralTodo(this);
if (KOPrefs::instance()->mCompactDialogs) {
TQFrame *topFrame = addPage(i18n("General"));
@@ -131,10 +131,10 @@ void KOTodoEditor::setupGeneral()
mGeneral->iniStatus(topFrame,topLayout);
mGeneral->initDescription(topFrame,topLayout);
mGeneral->initAttachments(topFrame,topLayout);
- connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
- this, TQT_SLOT( openURL( const KURL& ) ) );
- connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
- mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
+ connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ),
+ this, TQ_SLOT( openURL( const KURL& ) ) );
+ connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ),
+ mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) );
}
mGeneral->finishSetup();
}
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index a571d88b..ebccd4d2 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -36,7 +36,7 @@ class KOEditorRecurrence;
*/
class KOTodoEditor : public KOIncidenceEditor
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 8ae2703f..bbbb71db 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -299,7 +299,7 @@ void KOTodoListView::contentsMousePressEvent(TQMouseEvent* e)
treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
itemMargin() ||
p.x() < header()->sectionPos(header()->mapToIndex(0))) {
- if (e->button()==Qt::LeftButton) {
+ if (e->button()==TQt::LeftButton) {
mPressPos = e->pos();
mMousePressed = true;
}
@@ -424,16 +424,16 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name)
mPriority[ mPriorityPopupMenu->insertItem( i18n( "7" ) ) ] = 7;
mPriority[ mPriorityPopupMenu->insertItem( i18n( "8" ) ) ] = 8;
mPriority[ mPriorityPopupMenu->insertItem( i18n( "9 (lowest)" ) ) ] = 9;
- connect( mPriorityPopupMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( setNewPriority( int ) ));
+ connect( mPriorityPopupMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( setNewPriority( int ) ));
mPercentageCompletedPopupMenu = new TQPopupMenu(this);
for (int i = 0; i <= 100; i+=10) {
TQString label = TQString ("%1 %").arg (i);
mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
}
- connect( mPercentageCompletedPopupMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( setNewPercentage( int ) ) );
+ connect( mPercentageCompletedPopupMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( setNewPercentage( int ) ) );
mMovePopupMenu = new KDatePickerPopup(
KDatePickerPopup::NoDate |
@@ -445,76 +445,76 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name)
KDatePickerPopup::Words );
- connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate )),
- TQT_SLOT( setNewDate( TQDate ) ) );
- connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate )),
- TQT_SLOT( copyTodoToDate( TQDate ) ) );
+ connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate )),
+ TQ_SLOT( setNewDate( TQDate ) ) );
+ connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate )),
+ TQ_SLOT( copyTodoToDate( TQDate ) ) );
mItemPopupMenu = new TQPopupMenu(this);
mItemPopupMenu->insertItem(i18n("&Show"), this,
- TQT_SLOT (showTodo()));
+ TQ_SLOT (showTodo()));
mItemPopupMenu->insertItem(i18n("&Edit..."), this,
- TQT_SLOT (editTodo()), 0, ePopupEdit );
+ TQ_SLOT (editTodo()), 0, ePopupEdit );
#ifndef KORG_NOPRINTER
- mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) );
+ mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQ_SLOT( printTodo() ) );
#endif
mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this,
- TQT_SLOT (deleteTodo()), 0, ePopupDelete );
+ TQ_SLOT (deleteTodo()), 0, ePopupDelete );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this,
- TQT_SLOT (newTodo()) );
+ TQ_SLOT (newTodo()) );
mItemPopupMenu->insertItem(i18n("New Su&b-to-do..."), this,
- TQT_SLOT (newSubTodo()));
+ TQ_SLOT (newSubTodo()));
mItemPopupMenu->insertItem( i18n("&Make this To-do Independent"), this,
- TQT_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo );
+ TQ_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo );
mItemPopupMenu->insertItem( i18n("Make all Sub-to-dos &Independent"), this,
- TQT_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo );
+ TQ_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem( i18n("&Copy To"), mCopyPopupMenu, ePopupCopyTo );
mItemPopupMenu->insertItem(i18n("&Move To"), mMovePopupMenu, ePopupMoveTo );
mItemPopupMenu->insertSeparator();
mItemPopupMenu->insertItem(i18n("delete completed to-dos","Pur&ge Completed"),
- this, TQT_SLOT( purgeCompleted() ) );
+ this, TQ_SLOT( purgeCompleted() ) );
- connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ),
- mItemPopupMenu, TQT_SLOT( hide() ) );
- connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ),
- mItemPopupMenu, TQT_SLOT( hide() ) );
+ connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ),
+ mItemPopupMenu, TQ_SLOT( hide() ) );
+ connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ),
+ mItemPopupMenu, TQ_SLOT( hide() ) );
mPopupMenu = new TQPopupMenu(this);
mPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("&New To-do..."), this,
- TQT_SLOT(newTodo()) );
+ TQ_SLOT(newTodo()) );
mPopupMenu->insertItem(i18n("delete completed to-dos","&Purge Completed"),
- this, TQT_SLOT(purgeCompleted()));
+ this, TQ_SLOT(purgeCompleted()));
mDocPrefs = new DocPrefs( name );
// Double clicking conflicts with opening/closing the subtree
- connect( mTodoListView, TQT_SIGNAL( doubleClicked( TQListViewItem *,
+ connect( mTodoListView, TQ_SIGNAL( doubleClicked( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mTodoListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
- TQT_SLOT( editItem( TQListViewItem * ) ) );
- connect( mTodoListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *,
+ TQ_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mTodoListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+ TQ_SLOT( editItem( TQListViewItem * ) ) );
+ connect( mTodoListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
- connect( mTodoListView, TQT_SIGNAL( expanded( TQListViewItem * ) ),
- TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
- connect( mTodoListView, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
- TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( mTodoListView, TQ_SIGNAL( expanded( TQListViewItem * ) ),
+ TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( mTodoListView, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
+ TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
#if 0
- connect(mTodoListView,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
- connect(mTodoListView,TQT_SIGNAL(clicked(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
- connect(mTodoListView,TQT_SIGNAL(pressed(TQListViewItem *)),
- TQT_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(clicked(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
+ connect(mTodoListView,TQ_SIGNAL(pressed(TQListViewItem *)),
+ TQ_SLOT(selectionChanged(TQListViewItem *)));
#endif
- connect( mTodoListView, TQT_SIGNAL(selectionChanged() ),
- TQT_SLOT( processSelectionChange() ) );
- connect( mQuickAdd, TQT_SIGNAL( returnPressed () ),
- TQT_SLOT( addQuickTodo() ) );
+ connect( mTodoListView, TQ_SIGNAL(selectionChanged() ),
+ TQ_SLOT( processSelectionChange() ) );
+ connect( mQuickAdd, TQ_SIGNAL( returnPressed () ),
+ TQ_SLOT( addQuickTodo() ) );
new KOTodoListViewToolTip( mTodoListView->viewport(), calendar, mTodoListView );
}
@@ -648,7 +648,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem )
{
if ( todoItem ) {
mItemsToDelete.append( todoItem );
- TQTimer::singleShot( 0, this, TQT_SLOT( removeTodoItems() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( removeTodoItems() ) );
return true;
} else
return false;
@@ -731,13 +731,13 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
}
break;
default:
- TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) );
}
} else {
// use a TQTimer here, because when marking todos finished using
// the checkbox, this slot gets called, but we cannot update the views
// because we're still inside KOTodoViewItem::stateChange
- TQTimer::singleShot(0,this,TQT_SLOT(updateView()));
+ TQTimer::singleShot(0,this,TQ_SLOT(updateView()));
}
}
@@ -857,7 +857,7 @@ void KOTodoView::printTodo()
#ifndef KORG_NOPRINTER
KOCoreHelper helper;
CalPrinter printer( this, BaseView::calendar(), &helper );
- connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) );
+ connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) );
Incidence::List selectedIncidences;
selectedIncidences.append( mActiveItem->todo() );
@@ -1015,8 +1015,8 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem )
tempMenu->setItemChecked( index, true );
}
- connect ( tempMenu, TQT_SIGNAL( activated( int ) ),
- TQT_SLOT( changedCategories( int ) ) );
+ connect ( tempMenu, TQ_SIGNAL( activated( int ) ),
+ TQ_SLOT( changedCategories( int ) ) );
return tempMenu;
}
@@ -1065,9 +1065,9 @@ void KOTodoView::itemStateChanged( TQListViewItem *item )
void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage )
{
- mPercentChangedMap.append( tqMakePair( item, percentage ) );
+ mPercentChangedMap.append( qMakePair( item, percentage ) );
- TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( processDelayedNewPercentage() ) );
}
void KOTodoView::processDelayedNewPercentage()
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 662f6b13..e8204c74 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -71,7 +71,7 @@ class KOTodoListViewToolTip : public TQToolTip
class KOTodoListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTodoListView( TQWidget *parent = 0, const char *name = 0 );
@@ -112,7 +112,7 @@ class KOTodoListView : public TDEListView
*/
class KOTodoView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2ee92b12..b983d953 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -225,60 +225,60 @@ void KOViewManager::connectView(KOrg::BaseView *view)
if (!view) return;
// selecting an incidence
- connect( view, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
- mMainView, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
+ connect( view, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
+ mMainView, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) );
// showing/editing/deleting an incidence. The calendar view takes care of the action.
- connect( view, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) );
- connect( view, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) );
- connect( view, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(deleteIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(copyIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
- mMainView, TQT_SLOT(cutIncidence(Incidence *)) );
- connect( view, TQT_SIGNAL(pasteIncidenceSignal()),
- mMainView, TQT_SLOT(pasteIncidence()));
- connect( view, TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
- mMainView, TQT_SLOT(toggleAlarm(Incidence *)) );
- connect( view,TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) );
- connect( view,TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
- mMainView, TQT_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) );
+ connect( view, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(deleteIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(copyIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(copyIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(cutIncidenceSignal(Incidence *)),
+ mMainView, TQ_SLOT(cutIncidence(Incidence *)) );
+ connect( view, TQ_SIGNAL(pasteIncidenceSignal()),
+ mMainView, TQ_SLOT(pasteIncidence()));
+ connect( view, TQ_SIGNAL(toggleAlarmSignal(Incidence *)),
+ mMainView, TQ_SLOT(toggleAlarm(Incidence *)) );
+ connect( view,TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) );
+ connect( view,TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
+ mMainView, TQ_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) );
// signals to create new incidences
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) );
- connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
- mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) );
-
- connect( view, TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) );
- connect( view, TQT_SIGNAL(newSubTodoSignal(Todo *)),
- mMainView, TQT_SLOT(newSubTodo(Todo *)) );
-
- connect( view, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- mMainView, TQT_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) );
+ connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
+ mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) );
+
+ connect( view, TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) );
+ connect( view, TQ_SIGNAL(newSubTodoSignal(Todo *)),
+ mMainView, TQ_SLOT(newSubTodo(Todo *)) );
+
+ connect( view, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ mMainView, TQ_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) );
// reload settings
- connect(mMainView, TQT_SIGNAL(configChanged()), view, TQT_SLOT(updateConfig()));
+ connect(mMainView, TQ_SIGNAL(configChanged()), view, TQ_SLOT(updateConfig()));
// Notifications about added, changed and deleted incidences
- connect( mMainView, TQT_SIGNAL( dayPassed( const TQDate & ) ),
- view, TQT_SLOT( dayPassed( const TQDate & ) ) );
- connect( view, TQT_SIGNAL( startMultiModify( const TQString & ) ),
- mMainView, TQT_SLOT( startMultiModify( const TQString & ) ) );
- connect( view, TQT_SIGNAL( endMultiModify() ),
- mMainView, TQT_SLOT( endMultiModify() ) );
-
- connect( mMainView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
- view, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
+ connect( mMainView, TQ_SIGNAL( dayPassed( const TQDate & ) ),
+ view, TQ_SLOT( dayPassed( const TQDate & ) ) );
+ connect( view, TQ_SIGNAL( startMultiModify( const TQString & ) ),
+ mMainView, TQ_SLOT( startMultiModify( const TQString & ) ) );
+ connect( view, TQ_SIGNAL( endMultiModify() ),
+ mMainView, TQ_SLOT( endMultiModify() ) );
+
+ connect( mMainView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ),
+ view, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) );
view->setIncidenceChanger( mMainView->incidenceChanger() );
}
@@ -287,12 +287,12 @@ void KOViewManager::connectTodoView( KOTodoView* todoView )
if (!todoView) return;
// SIGNALS/SLOTS FOR TODO VIEW
- connect( todoView, TQT_SIGNAL( purgeCompletedSignal() ),
- mMainView, TQT_SLOT( purgeCompleted() ) );
- connect( todoView, TQT_SIGNAL( unSubTodoSignal() ),
- mMainView, TQT_SLOT( todo_unsub() ) );
- connect( todoView, TQT_SIGNAL( unAllSubTodoSignal() ),
- mMainView, TQT_SLOT( makeSubTodosIndependent() ) );
+ connect( todoView, TQ_SIGNAL( purgeCompletedSignal() ),
+ mMainView, TQ_SLOT( purgeCompleted() ) );
+ connect( todoView, TQ_SIGNAL( unSubTodoSignal() ),
+ mMainView, TQ_SLOT( todo_unsub() ) );
+ connect( todoView, TQ_SIGNAL( unAllSubTodoSignal() ),
+ mMainView, TQ_SLOT( makeSubTodosIndependent() ) );
}
void KOViewManager::zoomInHorizontally()
@@ -357,8 +357,8 @@ void KOViewManager::showAgendaView()
TQWidget *parent = mMainView->viewStack();
if ( !mAgendaViewTabs && showBoth ) {
mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() );
- connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ),
- this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
+ connect( mAgendaViewTabs, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+ this, TQ_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) );
parent = mAgendaViewTabs;
TDEConfig *config = KOGlobals::self()->config();
@@ -374,13 +374,13 @@ void KOViewManager::showAgendaView()
addView(mAgendaView);
- connect(mAgendaView, TQT_SIGNAL( toggleExpand() ),
- mMainView, TQT_SLOT( toggleExpand() ) );
- connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ),
- mAgendaView, TQT_SLOT( setExpandedButton( bool ) ) );
+ connect(mAgendaView, TQ_SIGNAL( toggleExpand() ),
+ mMainView, TQ_SLOT( toggleExpand() ) );
+ connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ),
+ mAgendaView, TQ_SLOT( setExpandedButton( bool ) ) );
- connect( mAgendaView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
- mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );
+ connect( mAgendaView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
+ mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );
mAgendaView->readSettings();
}
@@ -391,13 +391,13 @@ void KOViewManager::showAgendaView()
addView(mAgendaSideBySideView);
-/* connect(mAgendaSideBySideView, TQT_SIGNAL( toggleExpand() ),
- mMainView, TQT_SLOT( toggleExpand() ) );
- connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ),
- mAgendaSideBySideView, TQT_SLOT( setExpandedButton( bool ) ) );
+/* connect(mAgendaSideBySideView, TQ_SIGNAL( toggleExpand() ),
+ mMainView, TQ_SLOT( toggleExpand() ) );
+ connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ),
+ mAgendaSideBySideView, TQ_SLOT( setExpandedButton( bool ) ) );
- connect( mAgendaSideBySideView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
- mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );*/
+ connect( mAgendaSideBySideView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )),
+ mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );*/
}
if ( showBoth && mAgendaViewTabs ) {
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index fe41d5bb..93858fae 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -51,7 +51,7 @@ using namespace KCal;
*/
class KOViewManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 7b8ab992..7c8ce447 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -70,7 +70,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
// dateLabel->setAlignment(AlignCenter);
mView = new WhatsNextTextBrowser(this);
- connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
+ connect(mView,TQ_SIGNAL(showIncidence(const TQString &)),TQ_SLOT(showIncidence(const TQString &)));
TQBoxLayout *topLayout = new TQVBoxLayout(this);
// topLayout->addWidget(dateLabel);
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 22c55f5d..126a7055 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -33,7 +33,7 @@ class TQListView;
class KOEventViewerDialog;
class WhatsNextTextBrowser : public TQTextBrowser {
- Q_OBJECT
+ TQ_OBJECT
public:
WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {}
@@ -50,7 +50,7 @@ class WhatsNextTextBrowser : public TQTextBrowser {
*/
class KOWhatsNextView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h
index 69523160..fa307b8b 100644
--- a/korganizer/kowindowlist.h
+++ b/korganizer/kowindowlist.h
@@ -42,7 +42,7 @@ class KURL;
*/
class KOWindowList : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 7cbd42eb..e900fa48 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -57,7 +57,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
TQVBox *topSideBox = new TQVBox( this );
mLeftTopSpacer = new TQWidget( topSideBox );
mLeftTopSpacer->setFixedHeight( topLabelHeight );
- mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+ mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox );
mLeftSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
@@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
topSideBox = new TQVBox( this );
mRightTopSpacer = new TQWidget( topSideBox );
mRightTopSpacer->setFixedHeight( topLabelHeight );
- mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
+ mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox );
mRightSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
new TQWidget( mRightSplitter );
sideBox = new TQVBox( mRightSplitter );
eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
- mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
+ mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
eiSpacer->changeColumns( 0 );
@@ -142,13 +142,13 @@ void MultiAgendaView::recreateViews()
}
setupViews();
- TQTimer::singleShot( 0, this, TQT_SLOT(slotResizeScrollView()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotResizeScrollView()) );
mTimeLabels->updateConfig();
- connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- mScrollBar, TQT_SLOT(setValue(int)) );
- connect( mScrollBar, TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged(int)) );
+ connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ mScrollBar, TQ_SLOT(setValue(int)) );
+ connect( mScrollBar, TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged(int)) );
installSplitterEventFilter( mLeftSplitter );
installSplitterEventFilter( mRightSplitter );
@@ -163,7 +163,7 @@ void MultiAgendaView::recreateViews()
mLeftSplitter->setSizes( sizes );
mRightSplitter->setSizes( sizes );
- TQTimer::singleShot( 0, this, TQT_SLOT(setupScrollBar()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(setupScrollBar()) );
mTimeLabels->positionChanged();
}
@@ -185,79 +185,79 @@ void MultiAgendaView::setupViews()
FOREACH_VIEW( agenda ) {
if ( !agenda->readOnly() ) {
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) );
connect( agenda,
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
- TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) );
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)),
+ TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) );
connect( agenda,
- TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
- TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
+ TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)),
+ TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
connect( agenda,
- TQT_SIGNAL(startMultiModify(const TQString &)),
- TQT_SIGNAL(startMultiModify(const TQString &)) );
+ TQ_SIGNAL(startMultiModify(const TQString &)),
+ TQ_SIGNAL(startMultiModify(const TQString &)) );
connect( agenda,
- TQT_SIGNAL(endMultiModify()),
- TQT_SIGNAL(endMultiModify()) );
+ TQ_SIGNAL(endMultiModify()),
+ TQ_SIGNAL(endMultiModify()) );
connect( agenda,
- TQT_SIGNAL(cutIncidenceSignal(Incidence*)),
- TQT_SIGNAL(cutIncidenceSignal(Incidence*)) );
+ TQ_SIGNAL(cutIncidenceSignal(Incidence*)),
+ TQ_SIGNAL(cutIncidenceSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(pasteIncidenceSignal()),
- TQT_SIGNAL(pasteIncidenceSignal()) );
+ TQ_SIGNAL(pasteIncidenceSignal()),
+ TQ_SIGNAL(pasteIncidenceSignal()) );
connect( agenda,
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)),
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)) );
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)),
+ TQ_SIGNAL(toggleAlarmSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)),
- TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) );
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)),
+ TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) );
connect( agenda,
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)),
- TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) );
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)),
+ TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) );
}
connect( agenda,
- TQT_SIGNAL(copyIncidenceSignal(Incidence*)),
- TQT_SIGNAL(copyIncidenceSignal(Incidence*)) );
+ TQ_SIGNAL(copyIncidenceSignal(Incidence*)),
+ TQ_SIGNAL(copyIncidenceSignal(Incidence*)) );
connect( agenda,
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
- TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)),
+ TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) );
connect( agenda,
- TQT_SIGNAL(incidenceSelected(Incidence*,const TQDate &)),
- TQT_SLOT(slotSelectionChanged()) );
+ TQ_SIGNAL(incidenceSelected(Incidence*,const TQDate &)),
+ TQ_SLOT(slotSelectionChanged()) );
connect( agenda,
- TQT_SIGNAL(timeSpanSelectionChanged()),
- TQT_SLOT(slotClearTimeSpanSelection()) );
+ TQ_SIGNAL(timeSpanSelectionChanged()),
+ TQ_SLOT(slotClearTimeSpanSelection()) );
disconnect( agenda->agenda(),
- TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)),
+ TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)),
agenda, 0 );
connect( agenda->agenda(),
- TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)),
- TQT_SLOT(zoomView(const int,const TQPoint&,const Qt::Orientation)) );
+ TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)),
+ TQ_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) );
}
KOAgenda *anAgenda = mAgendaViews.first()->agenda();
- connect( anAgenda, TQT_SIGNAL(lowerYChanged(int) ), TQT_SLOT(resizeSpacers(int)) );
+ connect( anAgenda, TQ_SIGNAL(lowerYChanged(int) ), TQ_SLOT(resizeSpacers(int)) );
FOREACH_VIEW( agenda ) {
agenda->readSettings();
@@ -409,10 +409,10 @@ void MultiAgendaView::addView( const TQString &label, ResourceCalendar *res, con
box->show();
mTimeLabels->setAgenda( av->agenda() );
- connect( av->agenda()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- mTimeLabels, TQT_SLOT(positionChanged(int)) );
- connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)),
- av, TQT_SLOT(setContentsPos(int)) );
+ connect( av->agenda()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ mTimeLabels, TQ_SLOT(positionChanged(int)) );
+ connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)),
+ av, TQ_SLOT(setContentsPos(int)) );
av->installEventFilter( this );
installSplitterEventFilter( av->splitter() );
@@ -459,19 +459,19 @@ void MultiAgendaView::updateConfig()
bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
{
- if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) {
+ if ( obj->className() == TQCString("TQSplitterHandle") ) {
// KDE4: not needed anymore, TQSplitter has a moved signal there
if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize())
|| event->type() == TQEvent::MouseButtonRelease ) {
FOREACH_VIEW( agenda ) {
- if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) )
+ if ( agenda->splitter() == obj->parent() )
mLastMovedSplitter = agenda->splitter();
}
- if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) )
+ if ( mLeftSplitter == obj->parent() )
mLastMovedSplitter = mLeftSplitter;
- else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) )
+ else if ( mRightSplitter == obj->parent() )
mLastMovedSplitter = mRightSplitter;
- TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(resizeSplitters()) );
}
}
@@ -520,9 +520,9 @@ void MultiAgendaView::resizeSpacers( int newY )
mRightTopSpacer->setFixedHeight( topLabelHeight );
}
-void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
+void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const TQt::Orientation ori )
{
- if ( ori == Qt::Vertical ) {
+ if ( ori == TQt::Vertical ) {
if ( delta > 0 ) {
if ( KOPrefs::instance()->mHourSize > 4 )
KOPrefs::instance()->mHourSize--;
@@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
// KDE4: not needed, use existing TQSplitter signals instead
void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter)
{
- TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING );
+ TQObjectList *objlist = splitter->queryList( "TQSplitterHandle" );
// HACK: when not being visible, the splitter handle is sometimes not found
// for unknown reasons, so trigger an update when we are shown again
if ( objlist->count() == 0 && !isVisible() )
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index f3e22754..a3dba886 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -40,7 +40,7 @@ namespace KOrg {
*/
class MultiAgendaView : public AgendaView
{
- Q_OBJECT
+ TQ_OBJECT
public:
explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView,
@@ -91,7 +91,7 @@ class MultiAgendaView : public AgendaView
void resizeSplitters();
void resizeSpacers( int );
void setupScrollBar();
- void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ori );
+ void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ori );
void slotResizeScrollView();
private:
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 223cbb98..23581036 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -118,12 +118,12 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
ctrlLayout->addWidget( mNextMonth );
ctrlLayout->addWidget( mNextYear );
- connect( mPrevYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevYearClicked() ) );
- connect( mPrevMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevMonthClicked() ) );
- connect( mNextMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextMonthClicked() ) );
- connect( mNextYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextYearClicked() ) );
- connect( mMonth, TQT_SIGNAL( clicked() ), TQT_SLOT( selectMonthFromMenu() ) );
- connect( mYear, TQT_SIGNAL( clicked() ), TQT_SLOT( selectYearFromMenu() ) );
+ connect( mPrevYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevYearClicked() ) );
+ connect( mPrevMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevMonthClicked() ) );
+ connect( mNextMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextMonthClicked() ) );
+ connect( mNextYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextYearClicked() ) );
+ connect( mMonth, TQ_SIGNAL( clicked() ), TQ_SLOT( selectMonthFromMenu() ) );
+ connect( mYear, TQ_SIGNAL( clicked() ), TQ_SLOT( selectYearFromMenu() ) );
}
NavigatorBar::~NavigatorBar()
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 13d39716..fcff809f 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -33,7 +33,7 @@ class TQFrame;
class ActiveLabel : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
ActiveLabel( TQWidget *parent, const char *name = 0 );
@@ -48,7 +48,7 @@ class ActiveLabel : public TQLabel
class NavigatorBar: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
NavigatorBar( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/datenums/CMakeLists.txt b/korganizer/plugins/datenums/CMakeLists.txt
index c52d4c04..1ae3e8c1 100644
--- a/korganizer/plugins/datenums/CMakeLists.txt
+++ b/korganizer/plugins/datenums/CMakeLists.txt
@@ -25,7 +25,11 @@ link_directories(
##### other data ################################
-install( FILES datenums.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
+tde_create_translated_desktop(
+ SOURCE datenums.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/korganizer
+ PO_DIR korganizer-desktops
+)
##### libkorg_datenums (module) #################
diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h
index d5e6a52c..9bc2bc87 100644
--- a/korganizer/plugins/datenums/configdialog.h
+++ b/korganizer/plugins/datenums/configdialog.h
@@ -25,7 +25,7 @@ class TQButtonGroup;
class ConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ConfigDialog(TQWidget *parent=0);
diff --git a/korganizer/plugins/datenums/datenums.desktop b/korganizer/plugins/datenums/datenums.desktop
index 32f15578..10ea1d49 100644
--- a/korganizer/plugins/datenums/datenums.desktop
+++ b/korganizer/plugins/datenums/datenums.desktop
@@ -1,96 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_datenums
+
Name=Date Numbers Plugin for Calendars
-Name[af]=Dag nommer inprop module vir kalenders
-Name[ar]=قابس أرقام التاريخ للتقويم
-Name[bg]=Приставка на календара за дати
-Name[bs]=Dodatak za kalendar - brojevi datuma
-Name[ca]=Endollable de números de data per als calendaris
-Name[cs]=Modul pro očíslování dat v kalendáři
-Name[da]=Datonumre-plugin for kalendere
-Name[de]=Kalendertag-Modul für Kalender
-Name[el]=Πρόσθετο αριθμού ημερών για Ημερολόγια
-Name[eo]=Datnumera kromaĵo por Kalendaro
-Name[es]=Accesorio de números de fecha para calendarios
-Name[et]=Kuupäeva nummerdamise plugin kalendritele
-Name[eu]=Egutegientzako data zenbakiak
-Name[fa]=وصلۀ عدد تاریخ برای تقویمها
-Name[fi]=Päivämääräliitännäinen kalentereihin
-Name[fr]=Module de numérotation des jours
-Name[fy]=Datumgetallenplugin foar aginda's
-Name[gl]=Engadido para Números dos Días nos Calendarios
-Name[he]=תוסף מספרי תאריכים ללוחות שנה
-Name[hu]=Dátumkezelő bővítőmodul naptárakhoz
-Name[is]=Íforrit fyrir númer dags á dagatali
-Name[it]=Plugin delle date per i calendari
-Name[ja]=日数表示カレンダープラグイン
-Name[kk]=Күнтізбедегі күн нөмірінің модулі
-Name[km]=កម្មវិធី​ជំនួយ​លេខ​កាលបរិច្ឆេទ​សម្រាប់​ប្រតិទិន
-Name[lt]=Datų numerių priedas kalendoriams
-Name[ms]=Plugin Bilangan Tarikh untuk Kalendar
-Name[nb]=Datonummer programtillegg for Kalender
-Name[nds]=Kalennerdag-Moduul för Kalenners
-Name[ne]=क्यालेन्डरका लागि मिति सङ्ख्या प्लगइन
-Name[nl]=Datumgetallenplugin voor agenda's
-Name[nn]=Datonummer programtillegg for Kalender
-Name[pl]=Wtyczka numerów dni dla Kalendarzy
-Name[pt]='plugin' de Números de Datas para Calendários
-Name[pt_BR]=Plugin-de Números e Datas para Calendários
-Name[ru]=Даты календаря
-Name[sk]=Modul dátumov pre kalendáre
-Name[sl]=Datumski vstavek za koledarje
-Name[sr]=Прикључак календара за бројеве датума
-Name[sr@Latn]=Priključak kalendara za brojeve datuma
-Name[sv]=Datuminsticksprogram för kalendrar
-Name[ta]=நாள்காட்டிகளுக்கான தேதி எண்களின் சொருகுப்பொருள்
-Name[tg]=Санаҳои тақвим
-Name[tr]=Takvimler için Tarih Rakamları Eklentisi
-Name[uk]=Втулок дат для календарів
-Name[zh_CN]=日历的日期数字插件
-Name[zh_TW]=行事曆日期數字外掛程式
+
Comment=For each day this plugin shows its daynumber of the year at the top of the agenda view. For example, February 1 is day 32 of the year.
-Comment[af]=Die inprop module vertoon die dag nommer van die jaar bo aan die agenda aansig. Bv: 1 Februarie is dag 32 van die jaar.
-Comment[bg]=Приставката служи за показване на деня от началото на годината. Примерно, 1-ви февруари е 32-ия ден от годината.
-Comment[ca]=Per cada dia, aquest endollable mostra el número de dia de l'any al capdamunt de la vista d'agenda. Per exemple, 1 de Febrer és el dia 32 de l'any.
-Comment[cs]=tento modul pro každý den zobrazuje pořadí dne v roce na vrcholu pohledu. Např. 1. únor je 32 druhý den v roce.
-Comment[da]=For hver dag viser dette plugin nummeret for dagen i året for oven i agendavisningen. For eksempel er 1. februar 1 is den 32. dag i året.
-Comment[de]=Für jeden Tag des Jahres wird mit diesem Modul der Kalendertag oben in der Tagesansicht angezeigt. Der 1. Februar ist beispielsweise der 32. Kalendertag des Jahres.
-Comment[el]=Για κάθε μέρα, αυτό το πρόσθετο εμφανίζει τον αύξοντα αριθμό της ημέρας του έτους στην προβολή προγράμματος εργασίας. Για παράδειγμα, η 1ι Φεβρουαρίου είναι η ημέρα 32 του έτους.
-Comment[es]=Para cada día, esta extensión mostrará el número del día en el año en la parte superior de la vista de la agenda. Por ejemplo, el 1 de febrero es el día número 32 del año.
-Comment[et]=See plugin näitab iga päevakavavaate ülaosas iga päeva järjekorranumbrit aastas. Näiteks 1. veebruar on aasta 32. päev.
-Comment[eu]=Egun bakoitzeko, plugin honek bere urteko egun-zenbakia erakutsiko du agenda ikuspegiaren goiko aldean. Adibidez, Otsailak 1 urtearen 32. eguna da.
-Comment[fa]=در هر روز، این وصله عدد مربوط به روز سال را در بالای نمای agenda نمایش می‌دهد. مثلاً ۱ فوریه، سی و دومین روز سال می‌باشد.
-Comment[fi]=Tämä liitännäinen näyttää jokaisen päivän järjestysnumeron vuoden alusta agendanäkymässä. Esimerkiksi helmikuun ensimmäinen päivä on vuoden 32. päivä.
-Comment[fr]=Pour chaque jour, ce module montre le numéro du jour en haut de la vue agenda. Par exemple, le 1er février est le 32ème jour de l'année.
-Comment[fy]=Dizze plugin soarget derfoar dat it nûmer fan de dei boppe de agindawerjefte setten wurdt. Bygelyks, by 1 february heard deinûmer 32.
-Comment[gl]=Este engadido amosa cada día o número de día anual na vista superior da axenda. Por exemplo, o 1 de febreiro é o día 32 do ano.
-Comment[hu]=Megjeleníti az év elejétől eltelt napok számát az áttekintő nézet tetején. Például február elseje az év 32. napja.
-Comment[is]=Þetta íforrit sýnir efst í fundarskránni númer hvers dags í árinu. T.d. er 1. febrúar 32. dagurinn í árinu.
-Comment[it]=Per ciascun giorno, questo plugin mostra la data giuliana (numero progressivo a partire dal primo gennaio dell'anno corrente). Per esempio al primo di febbraio corrisponde il numero 32.
-Comment[ja]=このプラグインは予定表ビューの上に、それぞれの日がその年の何日目であるかを表示します。例えば、2 月 1 日はその年の 32 日目です。
-Comment[kk]=Бұл модуль күн тәртібі бетінің жоғарында жыл басынан өткен күндер санын көрсетеді. Мысалы, 1-ақпан жылдың 32-күні.
-Comment[km]=សម្រាប់​ថ្ងៃ​នីមួយៗ កម្មវិធី​ជំនួយ​នេះ​នឹង​បង្ហាញ​លេខ​ថ្ងៃ​នៃ​ឆ្នាំ នៅ​ផ្នែក​ខាង​លើ​នៃ​ទិដ្ឋភាព​របៀបវារៈ ។ ឧទាហរណ៍ ថ្ងៃ​ទី ១ ខែ កុម្ភៈ នឹង​ត្រូវ​ជា​ថ្ងៃ​ទី ៣២ នៃ​ឆ្នាំ ។
-Comment[lt]=Kiekvienai dienai šis priedas rodo metų dienos numerį tvarkyklės viršuje. Pvz., Vasario 1 yra32 metų diena.
-Comment[ms]=Setiap hari plugin ini memaparkan bilangan hari tahun tersebut di atas paparan agenda. Contohnya , 1 Februari adalah hari ke 32 bagi tahun tersebut.
-Comment[nb]=For hver dag viser dette programtillegget dagens nummer i året øverst på dagsvisningen. 1. februar er f.eks. dag nr. 32 i året.
-Comment[nds]=Dit Moduul wiest för elkeen Dag sien Nummer in't Johr baven de Dagansicht. De 1. Februor is t.B. de 32. Dag vun't Johr.
-Comment[ne]=प्रत्येक दिनका लागि यो प्लगइनले एजेन्डा दृश्यको माथि यस वर्षको दिन नम्बर देखाउछ । उदारणका लागि, फेब्रुवरी १ वर्षको बत्तिसौ दिन हो ।
-Comment[nl]=Deze plugin zorgt ervoor dat het dagnummer boven de agendaweergave wordt geplaatst. Bijvoorbeeld, bij 1 februari hoort dagnummer 32.
-Comment[nn]=For kvar dag vil dette programtillegget visa nummeret til denne dagen i året øvst i tidsplanen. 1. februar vil til dømes visast som dag 32.
-Comment[pl]=Ta wtyczka dla każdego dnia pokazuje jego numer kolejny w roku, na szczycie widoku planu. Na przykład, 1 luty to 32 dzień roku.
-Comment[pt]=Para cada dia, este 'plugin' mostra o seu número de dia do ano no topo da agenda. Por exemplo, o dia 1 de Fevereiro é o dia 32 do ano.
-Comment[pt_BR]=Para cada dia, esse plug-in mostra o número do dia no topo da visão de agenda. Por exemplo, 1º de fevereiro é o dia 32 do ano.
-Comment[ru]=Этот модуль показывает номер дня в году для каждой даты. Например, для 1 февраля будет показан номер 32.
-Comment[sk]=Tento modul pre každý deň zobrazí jeho číslo dňa v roku navrchu pohľadu agendy. Napríklad 1. február je deň číslo 32 v roku.
-Comment[sl]=Za vsak dan ta vstavek prikazuje številko dneva v letu na vrhu praikaza agende. Npr., 1. februar je 32. dan v letu.
-Comment[sr]=За сваки датум овај прикључак приказује његов број дана у години на врху приказа распореда. На пример, 1. фебруар је 32. дан у години.
-Comment[sr@Latn]=Za svaki datum ovaj priključak prikazuje njegov broj dana u godini na vrhu prikaza rasporeda. Na primer, 1. februar je 32. dan u godini.
-Comment[sv]=Insticksprogrammet visar dagens nummer under året för varje dag längst upp i agendavyn. Till exempel är 1:a februari den 32:e dagen under året.
-Comment[ta]=ஒவ்வோரு நாளும் நிகழ்ச்சி நிரல் காட்சியின் மேற்புறத்தில் வருடத்தின் நாளின் எண்ணை இந்த சொருகுப்பொருள் காட்டுகிறது. உதாரணமாக, பிப்ரவரி 1 வருடத்தின் 32வது நாள்
-Comment[tr]=Bu eklenti, her gün için tarih bilgisini gün sayısı olarak ajanda görünümünün yukarısında gösterir. Örneğin, 1 Şubat yılın 32. günüdür.
-Comment[uk]=Цей втулок показує зверху перегляду щоденника номер для кожного дня року. Наприклад, 1-го лютого - це 32 день року.
-Comment[zh_CN]=此插件可对每天在议事日程视图中上方显示该日在一年中的序号。例如,2月1日是一年的第32天。
-Comment[zh_TW]=對每一天,此外掛程式會顯示這是一年中的第幾天。
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
X-TDE-KOrganizer-HasSettings=true
diff --git a/korganizer/plugins/exchange/CMakeLists.txt b/korganizer/plugins/exchange/CMakeLists.txt
index f1f44361..833d343a 100644
--- a/korganizer/plugins/exchange/CMakeLists.txt
+++ b/korganizer/plugins/exchange/CMakeLists.txt
@@ -28,7 +28,12 @@ link_directories(
##### other data ################################
-install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
+tde_create_translated_desktop(
+ SOURCE exchange.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/korganizer
+ PO_DIR korganizer-desktops
+)
+
install( FILES exchangeui.rc DESTINATION ${DATA_INSTALL_DIR}/korganizer/plugins )
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e0bc1ab7..3a55cba9 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
setXMLFile("plugins/exchangeui.rc");
- new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()),
+ new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()),
actionCollection(), "exchange_download");
- TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()),
+ TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()),
actionCollection(), "exchange_upload");
- TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)),
- this, TQT_SLOT(slotIncidenceSelected(Incidence *)));
+ TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)),
+ this, TQ_SLOT(slotIncidenceSelected(Incidence *)));
action->setEnabled( false );
- TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
- action,TQT_SLOT(setEnabled(bool)));
+ TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+ action,TQ_SLOT(setEnabled(bool)));
- action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()),
+ action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()),
actionCollection(), "exchange_delete");
- TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)),
- action,TQT_SLOT(setEnabled(bool)));
+ TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)),
+ action,TQ_SLOT(setEnabled(bool)));
action->setEnabled( false );
- new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()),
+ new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()),
actionCollection(), "exchange_configure");
- connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) );
- connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
- mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) );
+ connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) );
+ connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)),
+ mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) );
}
Exchange::~Exchange()
diff --git a/korganizer/plugins/exchange/exchange.desktop b/korganizer/plugins/exchange/exchange.desktop
index a866c336..0c6fdb79 100644
--- a/korganizer/plugins/exchange/exchange.desktop
+++ b/korganizer/plugins/exchange/exchange.desktop
@@ -1,98 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_exchange
+
Name=Microsoft Exchange 2000 Plugin for KOrganizer
-Name[af]=Microsoft Exchange 2000 inprop module vir KOrganizer
-Name[be]=Дапаўненне K Арганізатара "Microsoft Exchange 2000"
-Name[bg]=Приставка на организатора за връзка с Microsoft Exchange 2000
-Name[bs]=Microsoft Exchange 2000 dodatak za KOrganizer
-Name[ca]=Endollable Microsoft Exchange 2000 per a KOrganizer
-Name[cs]=Modul Microsoft Exchange 2000 pro KOrganizer
-Name[da]=Microsoft Exchange 2000-plugin for KOrganizer
-Name[de]=Microsoft Exchange 2000-Modul für KOrganizer
-Name[el]=Πρόσθετο Microsoft Exchange 2000 του KOrganizer
-Name[eo]=Microsoft Exchange 2000-kromaĵo por Organizilo
-Name[es]=Accesorio de Microsoft Exchange 2000 para KOrganizer
-Name[et]=Microsoft Exchange 2000 plugin KOrganizeri jaoks
-Name[eu]=KOrganizer-en Microsoft Exchange 2000 plugin-a
-Name[fa]=وصلۀ Microsoft Exchange ۲۰۰۰ برای KOrganizer
-Name[fi]=KOrganizerin Microsoft Exchange 2000 -liitännäinen
-Name[fr]=Module Microsoft Exchange 2000 pour KOrganizer
-Name[fy]=Microsoft Exchange 2000 plugin foar KOrganizer
-Name[ga]=Breiseán Microsoft Exchange 2000 le haghaidh KOrganizer
-Name[gl]=Extensión de Microsoft Exchange 2000 para KOrganizer
-Name[hu]=Microsoft Exchange 2000-bővítőmodul a KOrganizerhez
-Name[is]=Microsoft Exchange 2000 íforrit fyrir KOrganizer
-Name[it]=Plugin Microsoft Exchange 2000 per KOrganizer
-Name[ja]=KOrganizer の Microsoft Exchange 2000 プラグイン
-Name[kk]=KOrganizer-дің Microsoft Exchange 2000 модулі
-Name[km]=កម្មវិធី​ជំនួយ​ម៉ៃក្រូសូហ្វ Exchange ២០០០ សម្រាប់ KOrganizer
-Name[lt]=Microsoft Exchange 2000 priedas, skirtas KOrganizer
-Name[mk]=Приклучок за КОрганизатор за Microsoft Exchange 2000
-Name[ms]=PLugin Microsoft Exchange 2000 untuk KOrganizer
-Name[nb]=Microsoft Exchange 2000 programtillegg for KOrganizer
-Name[nds]=MSExchange2000-Moduul för KOrganizer
-Name[ne]=केडीई आयोजकका लागि माइक्रोसफ्ट एक्सचेन्ज 2000
-Name[nl]=Microsoft Exchange 2000 plugin voor KOrganizer
-Name[nn]=Microsoft Exchange 2000 programtillegg for KOrganizer
-Name[pl]=Wtyczka Microsoft Exchange 2000 dla Organizatora
-Name[pt]='Plugin' do Microsoft Exchange 2000 para o KOrganizer
-Name[pt_BR]=Plug-in do Microsoft Exchange 2000 para o KOrganizer
-Name[ru]=Доступ к Microsoft Exchange 2000
-Name[sk]=KOrganizer modul pre Microsoft Exchange 2000
-Name[sl]=Vstavek za Microsoft Exchange 2000 za KOrganizer
-Name[sr]=Прикључак KOrganizer-а за Microsoft Exchange 2000
-Name[sr@Latn]=Priključak KOrganizer-a za Microsoft Exchange 2000
-Name[sv]=Microsoft Exchange 2000-insticksprogram för Korganizer
-Name[ta]=கேஅமைப்பாளருக்கான மைக்ரோசாஃப்ட் எக்ஸ்சேன்ஜ் 2000 சொருகுப்பொருள்
-Name[tg]=Дастрасӣ ба Microsoft Exchange 2000
-Name[tr]=KOrganizer için Microsoft Exchange 2000 Eklentisi
-Name[uk]=Втулок Microsoft Exchange 2000 для KOrganizer
-Name[zh_CN]=KOrganizer 的 Microsoft Exchange 2000 插件
-Name[zh_TW]=KOrganizer 的 Microsoft Exchange 2000 外掛程式
+
Comment=This plugin allows korganizer users to work with Microsoft Exchange 2000 groupware servers.
-Comment[af]=Hierdie inprop module maak dit vir korganizer gebruikers moontlik om met Microsoft Exchange 2000 bedieners te praat.
-Comment[bg]=Приставката служи за връзка на Korganizer със сървъра Microsoft Exchange 2000 groupware.
-Comment[ca]=Aquest endollable permet als usuaris de korganizer treballar amb servidors groupware Microsoft Exchange 2000.
-Comment[cs]=tento modul umožňuje pracovat uživatelům korganizeru s Microsoft Exchange 2000 groupware servery.
-Comment[da]=Dette plugin tillader brugere af korganizer at arbejde med Microsoft Exchange 2000 groupware servere.
-Comment[de]=Mit diesem Modul kann KOrganizer mit Microsoft Exchange 2000 Groupware-Servern zusammenarbeiten.
-Comment[el]=Αυτό το πρόσθετο επιτρέπει στους χρήστες του korganizer να δουλεύουν με εξυπηρετητές groupware του Microsoft Exchange 2000.
-Comment[es]=Esta extensión permite que los usuarios de korganizer trabajen con servidores de groupware de Microsoft Exchange 2000.
-Comment[et]=See plugin võimaldab KOrganizeri kasutajatel pruukida Microsoft Exchange 2000 grupitööservereid.
-Comment[eu]=Plugin honek korganizer-en erabiltzaileei Microsoft Exchange 2000 groupware zerbitzariekin lan egiteko aukera ematen die.
-Comment[fa]=این وصله به کاربران korganizer اجازه می‌دهد که با کارسازهای Microsoft Exchange 2000 groupware کار کند.
-Comment[fi]=Tämä liitännäinen mahdollistaa KOrganizer-käyttäjien työskentelemisen Microsoft Exchange 2000 -ryhmätyöpalvelimien kanssa.
-Comment[fr]=Ce module permet à KOrganizer de fonctionner avec Microsoft Exchange 2000
-Comment[fy]=Dizze plugin makket it mooglik om Microsoft Exchange 2000 te brûken yn KOrganizer.
-Comment[gl]=Este engadido permite que os usuarios de korganizer traballen con servidores de traballo en grupo Microsoft Exchange 2000
-Comment[hu]=Ez a modul lehetővé teszi KOrganizer-felhasználóknak Microsoft Exchange 2000-kiszolgálón tárolt csoportmunka-adatok elérését.
-Comment[is]=Þetta íforrit gerir KOrganizer kleyft að vinna með Microsoft Exchange 2000 hópvinnuþjónum.
-Comment[it]=Questo plugin permette agli utenti di korganizer di lavorare con i server groupware Microsoft Exchange 2000.
-Comment[ja]=このプラグインにより、korganizer のユーザが Microsoft Exchange 2000 グループウェアサーバと同期できるようになります。
-Comment[kk]=Бұл модуль korganizer-мен MS Exchange 2000 біріккен жұмыс сервермен істеуге мүмкіндік береді.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​របស់ korganizer ធ្វើការ​ជាមួយ​ម៉ាស៊ីន​បម្រើ​កម្មវិធី​ពហុ​អ្នកប្រើ​របស់​ម៉ៃក្រូសូហ្វ Exchange ២០០០ ។
-Comment[lt]=Šis priedas leidžia korganizer dirbti su Microsoft Exchange 2000 groupware serveriais.
-Comment[mk]=Овој приклучок им овозможува на корисниците на КОрганизатор да работат со groupware-серверите на Microsoft Exchange 2000.
-Comment[ms]=Plugin ini membenarkan pengguna korganizer bekerja bersama pelayan groupware Microsoft Exchange 2000.
-Comment[nb]=Med dette programtillegget kan korganizer-brukere arbeide med gruppevare-tjenere fra Microsoft Exchange 2000.i
-Comment[nds]=Över dit Moduul köönt KOrganizer-Brukers mit Groupware-Servers för MSExchange-2000 arbeiden.
-Comment[ne]=यो प्लगइनले माइक्रोसफ्ट एक्सचेन्ज 2000 ग्रुपवेयर सर्भरमा केडीई आयोजकलाई कार्य गर्न अनुमति दिन्छ ।
-Comment[nl]=Deze plugin maakt het mogelijk om Microsoft Exchange 2000 te gebruiken in KOrganizer.
-Comment[nn]=Dette programtillegget lèt KOrganizer-brukarar arbeida saman med Microsoft Exchange 2000-gruppevaretenarar.
-Comment[pl]=Ta wtyczka pozwala KOrganizerowi współpracować z serwerami pracy grupowej Microsoft Exchange.
-Comment[pt]=Este 'plugin' permite aos utilizadores do KOrganizer lidarem com servidores de 'groupware' do Microsoft Exchange 2000.
-Comment[pt_BR]=Esse plug-in permite que o KOrganizer conecte-se à servidores groupware Microsoft Exchance 2000
-Comment[ru]=Этот модуль позволяет пользователям органайзера работать с серверами совместной работы Microsoft Exchange 2000.
-Comment[sk]=Tento modul umožní, aby korganizer užívatelia pracovali s Microsoft Exchange 2000 groupware servermi.
-Comment[sl]=Ta vstavke omogoča uporabnikom KOrganizerja delo s strežniki Microsoft Exchange 2000.
-Comment[sr]=Овај прикључак омогућава корисницима KOrganizer-а да раде са Microsoft-овим Exchange 2000 groupware серверима.
-Comment[sr@Latn]=Ovaj priključak omogućava korisnicima KOrganizer-a da rade sa Microsoft-ovim Exchange 2000 groupware serverima.
-Comment[sv]=Insticksprogrammet gör det möjligt för användare av Korganizer att arbeta med Microsoft Exchange 2000 grupprogramservrar.
-Comment[ta]=இந்த சொருகுப்பொருள் korganizer பயனர்களை மைக்ரோசாப்ட் எக்ஸ்சேஞ்ச் 2000 குழுவாரி சேவகன்களில் பணி செய்ய அனுமதிக்கிறது.
-Comment[tr]=Bu eklenti KOrganizer kullanıcılarının Microsoft Exchange 2000 sunucuları ile çalışabilmelerini sağlar.
-Comment[uk]=Цей втулок дозволяє користувачам korganizer працювати з серверами групової роботи Microsoft Exchange 2000.
-Comment[zh_CN]=此插件允许 KOrganizer 用户与 Microsoft Exchange 2000 群件服务器协同工作。
-Comment[zh_TW]=這個外掛程式允許 KOrganizer 使用者與 Microsoft Exchange 2000 群組伺服器一起工作。
+
Type=Service
X-TDE-ServiceTypes=KOrganizer/Part
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 8de777fe..26c5e8de 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -34,7 +34,7 @@
using namespace KCal;
class Exchange : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
Exchange( KOrg::MainWindow *, const char *name );
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 106fc867..913482f3 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_user = new KLineEdit( mAccount->account(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 );
topLayout->addWidget( m_user, 2, 1 );
- connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) );
+ connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) );
m_password = new KLineEdit( mAccount->password(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 );
@@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame );
topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 );
- connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+ connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame );
topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 );
@@ -70,7 +70,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent
m_tryFindMailbox = new TQPushButton( "&Find", topFrame );
topLayout->addWidget( m_tryFindMailbox, 5, 2 );
- connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+ connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
kapp->config()->setGroup( "Calendar/Exchange Plugin" );
bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true );
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index a7aa3285..dc46da9b 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -29,7 +29,7 @@
class ExchangeConfig : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index 8c525f2b..fc102072 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -26,7 +26,7 @@ class TQComboBox;
class ExchangeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);
diff --git a/korganizer/plugins/hebrew/CMakeLists.txt b/korganizer/plugins/hebrew/CMakeLists.txt
index 1f397d7b..534dfa8f 100644
--- a/korganizer/plugins/hebrew/CMakeLists.txt
+++ b/korganizer/plugins/hebrew/CMakeLists.txt
@@ -24,7 +24,11 @@ link_directories(
##### other data ################################
-install( FILES hebrew.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
+tde_create_translated_desktop(
+ SOURCE hebrew.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/korganizer
+ PO_DIR korganizer-desktops
+)
##### libkorg_hebrew (module) ###################
diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h
index 805ba970..9a9f0b45 100644
--- a/korganizer/plugins/hebrew/configdialog.h
+++ b/korganizer/plugins/hebrew/configdialog.h
@@ -27,7 +27,7 @@
*/
class ConfigDialog:public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/korganizer/plugins/hebrew/hebrew.desktop b/korganizer/plugins/hebrew/hebrew.desktop
index 12395653..a7a65cbf 100644
--- a/korganizer/plugins/hebrew/hebrew.desktop
+++ b/korganizer/plugins/hebrew/hebrew.desktop
@@ -1,98 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_hebrew
+
Name=Jewish Calendar Plugin
-Name[af]=Joodse kalender inprop module
-Name[bg]=Приставка за еврейския календар
-Name[br]=Lugent deiziadur yudev
-Name[bs]=Dodatak za hebrejski kalendar
-Name[ca]=Endollable de calendari jueu
-Name[cs]=Modul židovského kalendáře
-Name[da]=Jødisk kalender-plugin
-Name[de]=Modul für jüdischen Kalender
-Name[el]=Πρόσθετο εβραϊκού ημερολογίου
-Name[eo]=Judkalendar-kromaĵo
-Name[es]=Accesorio de calendario judío
-Name[et]=Juudi kalendri plugin
-Name[eu]=Egutegi judutar plugin-a
-Name[fa]=وصلۀ تقویم یهودی
-Name[fi]=Juutalaisen kalenterin laajennus
-Name[fr]=Module de prise en charge du calendrier juif
-Name[fy]=Joadske kalenderplugin
-Name[gl]=Extensión para Calendario Xudeu
-Name[hu]=Bővítőmodul a zsidó naptár kezeléséhez
-Name[is]=Gyðinga dagatalsíforrit
-Name[it]=Plugin calendario ebraico
-Name[ja]=ユダヤ歴カレンダープラグイン
-Name[kk]=Яһуди күнтізбесінің модулі
-Name[km]=កម្មវិធី​ជំនួយ​ប្រតិទិន Jewish
-Name[lt]=Žydų kalendoriaus priedas
-Name[mk]=Приклучок за еврејски календар
-Name[ms]=PLugin Kalender Yahudi
-Name[nb]=Programtillegg for jødisk kalender
-Name[nds]=Moduul för juudschen Kalenner
-Name[ne]=यहूदि क्यालेन्डर प्लगइन
-Name[nl]=Joodse kalenderplugin
-Name[nn]=Programtillegg for jødisk kalender
-Name[pl]=Wtyczka kalendarza żydowskiego
-Name[pt]='Plugin' do Calendário Judeu
-Name[pt_BR]=Plug-in de Calendário Judaico
-Name[ru]=Еврейский календарь
-Name[sk]=Modul Židovského kalendára
-Name[sl]=Vstavek za židovski koledar
-Name[sr]=Прикључак календара за јеврејски календар
-Name[sr@Latn]=Priključak kalendara za jevrejski kalendar
-Name[sv]=Insticksprogram för judisk kalender
-Name[ta]=ஜூவிஷ் நாள்காட்டி சொருகுப்பொருள்
-Name[tg]=Тақвимоти яҳудӣ
-Name[tr]=İbrani Takvimi Eklentisi
-Name[uk]=Втулок єврейського календаря
-Name[zh_CN]=犹太教日历插件
-Name[zh_TW]=猶太行事曆外掛程式
+
Comment=Shows all dates in korganizer also in the Jewish calendar system.
-Comment[af]=Vertoon alle datums in KOrganizer ook volgens die Joodse kalender.
-Comment[bg]=Приставката служи за показване на датите според еврейския календар.
-Comment[ca]=Mostra totes les dates del korganizer també en el sistema del calendari jueu.
-Comment[cs]=Zobrazení všech dat v korganizeru také v židovském kalendáři.
-Comment[da]=Viser alle datoer i korganizer også i det jødiske kalendersystem.
-Comment[de]=Zeigt alle Daten in KOrganizer auch im jüdischen Kalendarium an.
-Comment[el]=Εμφανίζει όλες τις ημερομηνίες στο korganizer και στο εβραϊκό ημερολογιακό σύστημα.
-Comment[es]=Muestra todas las fechas de korganizer también en el sistema de calendario judío.
-Comment[et]=Näitab KOrganizeris kõiki kuupäevi ka juudi kalendri järgi.
-Comment[eu]=korganizer-en data guztiak egutegi judutar sisteman ere erakusten ditu.
-Comment[fa]=همۀ تاریخهای korganizer، همچنین سیستم تقویم یهودی را نمایش می‌دهد.
-Comment[fi]=Näyttää kaikki päivät KOrganizerissa myös Juutalaisen kalenterijärjestelmän mukaan.
-Comment[fr]=Affiche toutes les dates de KOrganizer selon le calendrier Juif
-Comment[fy]=Lit alle datums yn KOrganizer ek yn it Joadske kalinderssysteem sjen.
-Comment[gl]=Amosa todas as datas en korganizer, tamén o sistema de calendario xudeu.
-Comment[he]=מציג את כל התאריכים בארגונית גם בלוח השנה העברי
-Comment[hu]=A KOrganizer dátumait kiírja a hagyományos zsidó naptár szerint is.
-Comment[is]=Sýna alla dagsetningar í KOrganizer sem eru einnig í dagatali gyðinga.
-Comment[it]=Mostra tutte le date in korganizer secondo il calendario ebraico.
-Comment[ja]=korganizer のすべての日付をユダヤ暦でも表示します。
-Comment[kk]=Яһуди күнтізбе күндерін korganizer-де көрсететін модулі.
-Comment[km]=បង្ហាញ​កាលបរិច្ឆេទ​ទាំងអស់​ក្នុង korganizer នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិទិន Jewish ។
-Comment[lt]=Rodo visas dienas kalendoriuje taip pat ir žydų kalendoriaus sistema.
-Comment[mk]=Ги прикажува сите датуми во КОрганизатор и според еврејскиот календар.
-Comment[ms]=Memaparkan semua tarikh dalam korganizer dan juga dalam sistem kalendar Yahudi.
-Comment[nb]=Viser alle datoer i korganizer også i det jødiske kalendersystemet.
-Comment[nds]=Wiest all Daten binnen KOrganizer ok in den juudschen Kalenner.
-Comment[ne]=केडीई आयोजकमा पनि सबै मिति यहूदि क्यालेन्डर प्रणालीमा देखाउछ ।
-Comment[nl]=Toont alle data in KOrganizer ook in het Joodse kalendersysteem.
-Comment[nn]=Viser alle datoane i KOrganizer i den jødiske kalenderen.
-Comment[pl]=Pokazuje wszystkie daty w KOrganizerze również w kalendarzu żydowskim.
-Comment[pt]=Mostra todas as datas no KOrganizer também no sistema de calendários Judeu.
-Comment[pt_BR]=Mostra todas as datas no KOrganizer também no sistema de calendário judaico
-Comment[ru]=Показывать все даты по еврейскому календарю.
-Comment[sk]=Zobrazí všetky dátumy v korganizer tiež aj židovskom kalendári.
-Comment[sl]=Prikaže vse datume v KOrganizerju; tudi v židovskem koledarskem sistemu.
-Comment[sr]=Приказује све датуме у KOrganizer-у и по јеврејском календарском систему.
-Comment[sr@Latn]=Prikazuje sve datume u KOrganizer-u i po jevrejskom kalendarskom sistemu.
-Comment[sv]=Visar också alla datum i Korganizer enligt den judiska kalendern.
-Comment[ta]=korganizer மற்றும் ஜேவிஷ் நாட்காட்டி அமைப்பில் ல் உள்ள எல்லா தேதிகளையும் காட்டுகிறது.
-Comment[tr]=KOrganizer'da tüm tarihleri İbrani takvimine göre gösterir.
-Comment[uk]=Показує всі дати в korganizer також і в системі єврейського календаря.
-Comment[zh_CN]=在 KOrganizer 中显示犹太教日历系统的全部日期。
-Comment[zh_TW]=顯示所有猶太行事曆的日期
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
X-TDE-KOrganizer-HasSettings=true
diff --git a/korganizer/plugins/printing/journal/CMakeLists.txt b/korganizer/plugins/printing/journal/CMakeLists.txt
index 5844464b..62872462 100644
--- a/korganizer/plugins/printing/journal/CMakeLists.txt
+++ b/korganizer/plugins/printing/journal/CMakeLists.txt
@@ -27,7 +27,11 @@ link_directories(
##### other data ################################
-install( FILES journalprint.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
+tde_create_translated_desktop(
+ SOURCE journalprint.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/korganizer
+ PO_DIR korganizer-desktops
+)
##### libkorg_journalprint (module) #############
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index 6868729b..7239719e 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -194,8 +194,7 @@
<tabstop>mToDate</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kdateedit.h</includehint>
- <includehint>kdateedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kdateedit.h</include>
+</includes>
</UI>
diff --git a/korganizer/plugins/printing/journal/journalprint.desktop b/korganizer/plugins/printing/journal/journalprint.desktop
index 61b3dac0..4b8f3e23 100644
--- a/korganizer/plugins/printing/journal/journalprint.desktop
+++ b/korganizer/plugins/printing/journal/journalprint.desktop
@@ -1,92 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_journalprint
+
Name=Journal Print Style
-Name[af]=Joernaal druk styl
-Name[bg]=Стил на отпечатване на календар
-Name[ca]=Estil d'impressió del diari
-Name[cs]=Tiskový styl deníku
-Name[da]=Journal udskriftsstil
-Name[de]=Journal Druckstil
-Name[el]=Στυλ εκτύπωσης χρονικού
-Name[eo]=Ĵurnal-Presostilo
-Name[es]=Estilo de impresión del diario
-Name[et]=Päeviku trükkimise stiil
-Name[eu]=Egunkariak inprimatzeko estiloa
-Name[fa]=سبک چاپ نشریه
-Name[fi]=Päiväkirjan tulostustyyli
-Name[fr]=Impression en journal
-Name[fy]=Printstyl foar journaals
-Name[gl]=Imprimir en Estilo Xornal
-Name[hu]=Naplónyomtatási stílus
-Name[is]=Dagbókarprentstíll
-Name[it]=Stile di stampa a diario
-Name[ja]=ジャーナル印刷スタイル
-Name[kk]=Күнделікті басу стилі
-Name[km]=រចនាប័ទ្ម​បោះពុម្ព​ទិនានុប្បវត្តិ
-Name[lt]=Dienyno spausdinimo stilius
-Name[ms]=Gaya Cetak Jurnal
-Name[nb]=Utskriftsstil for dagbok
-Name[nds]=Daagbook-Druckstil
-Name[ne]=जर्नल मुद्रण शैली
-Name[nl]=Printstijl voor journaals
-Name[nn]=Utskriftsstil for dagbok
-Name[pl]=Styl drukowania dziennika
-Name[pt]=Estilo de Impressão em Diário
-Name[pt_BR]=Estilo de Impressão de Diário
-Name[ru]=Журнал
-Name[sk]=Štýl tlače žurnálu
-Name[sl]=Dnevniški slog tiskanja
-Name[sr]=Дневнички стил штампе
-Name[sr@Latn]=Dnevnički stil štampe
-Name[sv]=Journal-utskriftsstil
-Name[ta]=செய்தி அச்சுப்பாணி
-Name[tr]=Günlük Yazdırma Tarzı
-Name[uk]=Стиль друку журналом
-Name[zh_CN]=日记打印样式
-Name[zh_TW]=日誌列印風格
+
Comment=This plugin allows you to print out journal entries (diary entries).
-Comment[af]=Hierdie inprop module maak dit moontlik om joernaal inskrywings (dagboek inskrywings) te druk.
-Comment[bg]=Приставката служи за печат на дневника.
-Comment[ca]=Aquest endollable us permet imprimir entrades del diari.
-Comment[cs]=tento modul umožňuje tisk položek deníku.
-Comment[da]=Dette plugin gør at du kan udskrive journalindgange (dagbogsindgange).
-Comment[de]=Mit diesem Modul können Journaleinträge (Tagebucheinträge) gedruckt werden.
-Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε καταχωρήσεις χρονικού.
-Comment[es]=Esta extensión le permite imprimir entradas del diario.
-Comment[et]=See plugin võimaldab trükkida päeviku sissekandeid.
-Comment[eu]=Plugin honek egunkarien sarrerak (eguneroko sarrerak) inprimatzeko aukera ematen dizu.
-Comment[fa]=این وصله، به شما اجازه می‌دهد که مدخلهای نشریه )مدخلهای روزانه( را چاپ کنید.
-Comment[fi]=Tämä liitännäinen mahdollistaa päiväkirjan tulostuksen.
-Comment[fr]=Ce module vous permet d'imprimer l'ensemble de vos journaux personnels
-Comment[fy]=Dizze plugin makket it mooglik journalen út te printsjen (deiboekitems).
-Comment[gl]=Este engadido permítelle imprimir as entradas do xornal (entradas do diario).
-Comment[hu]=Ez a modul naplóbejegyzések kinyomtatását teszi lehetővé.
-Comment[is]=Þetta íforrit gerir þér kleyft að prenta út dagbókarfærslur.
-Comment[it]=Questo plugin ti permette di stampare le registrazioni del diario.
-Comment[ja]=このプラグインにより、ジャーナル (日誌) のエントリを印刷できるようになります。
-Comment[kk]=Бұл күнделіктің жазуларын басып шығаратын модулі.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បោះពុម្ព​ធាតុ​ទិនានុប្បវត្តិ (ធាតុ​កំណត់ហេតុ​ប្រចាំ​ថ្ងៃ) ។
-Comment[lt]=Šis priedas leidžia spausdinti dienyno įrašus.
-Comment[ms]=Plugin ini membenarkan anda mencetak entri jurnal (entri diari).
-Comment[nb]=Med dette programtillegget kan du skrive ut oppføringer i dagboka.
-Comment[nds]=Mit dit Moduul köönt Daagbook-Indrääg utdruckt warrn.
-Comment[ne]=यो प्लगइनले तपाईँलाई जर्नल प्रविष्टि मुद्रण गर्न अनुमति दिन्छ (दैनिक विवरण प्रविष्टि) ।
-Comment[nl]=Deze plugin maakt het mogelijk om journalen uit te printen (dagboekitems).
-Comment[nn]=Dette programtillegget lèt deg skriva ut dagboksoppføringar.
-Comment[pl]=Ta wtyczka pozwala drukować wpisy dziennika.
-Comment[pt]=Este diário permite-lhe imprimir os itens de diário.
-Comment[pt_BR]=Esse estilo lhe permite imprimir entradas de diário
-Comment[ru]=Этот модуль позволяет печатать журнал в виде дневника.
-Comment[sk]=Tento modul umožní vytlačiť položky žurnálu (denníkové položky).
-Comment[sl]=Ta vstavek vam omogoča natis vnosov v dnevnik.
-Comment[sr]=Овај прикључак вам омогућава да одштампате уносе из дневника.
-Comment[sr@Latn]=Ovaj priključak vam omogućava da odštampate unose iz dnevnika.
-Comment[sv]=Det här insticksprogrammet gör att du kan skriva ut journalanteckningar (dagboksanteckningar).
-Comment[ta]=இந்த சொருகுப்பொருள் இதழ் உள்ளீடுகளை அச்சிட உங்களை அனுமதிக்கிறது (நாள் குறிப்பேடு உள்ளீடுகள்).
-Comment[tr]=Bu eklenti, günlük girişlerinizi yazıcıdan çıkartmanızı sağlar.
-Comment[uk]=Цей журнал надає можливість друкувати записи журналу (записи щоденника).
-Comment[zh_CN]=此插件允许您打印日记项目。
-Comment[zh_TW]=此外掛程式讓您印出日誌項目。
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/printing/list/listprint.desktop b/korganizer/plugins/printing/list/listprint.desktop
index e7ef3d7b..4083c6f7 100644
--- a/korganizer/plugins/printing/list/listprint.desktop
+++ b/korganizer/plugins/printing/list/listprint.desktop
@@ -1,92 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_listprint
+
Name=List Print Style
-Name[af]=Lys druk styl
-Name[bg]=Печат като списък
-Name[ca]=Estil d'impressió en llista
-Name[cs]=Styl deníku - seznam
-Name[da]=Listeudskriftsstil
-Name[de]=Listen Druckstil
-Name[el]=Στυλ εκτύπωσης λίστας
-Name[eo]=List-Presostilo
-Name[es]=Estilo de impresión de la lista
-Name[et]=Nimekirja trükkimise stiil
-Name[eu]=Zerrenda inprimatzeko estiloa
-Name[fa]=سبک چاپ فهرست
-Name[fi]=Listatulostustyyli
-Name[fr]=Impression en liste
-Name[fy]=Printstyl foar listen
-Name[gl]=Imprimir en Estilo de Lista
-Name[hu]=Eseménylista kinyomtatása
-Name[is]=Listaprentstíll
-Name[it]=Stile di stampa ad elenco
-Name[ja]=リスト印刷スタイル
-Name[kk]=Тізімді басу стилі
-Name[km]=រចនាប័ទ្ម​បោះពុម្ព​បញ្ជី
-Name[lt]=Sąrašo spausdinimo stilius
-Name[ms]=Gaya Cetakan Senarai
-Name[nb]=Utskriftsstil for liste
-Name[nds]=Listen-Druckstil
-Name[ne]=सूची मुद्रण शैली
-Name[nl]=Printstijl voor lijsten
-Name[nn]=Utskriftsstil for dagbøker
-Name[pl]=Styl drukowania listy
-Name[pt]=Estilo de Impressão em Lista
-Name[pt_BR]=Estilo de Impressão em Lista
-Name[ru]=Список
-Name[sk]=Štýl tlače zoznamu
-Name[sl]=Slog tiskanja v obliki list
-Name[sr]=Листајући стил штампе
-Name[sr@Latn]=Listajući stil štampe
-Name[sv]=List-utskriftsstil
-Name[ta]=அச்சு பாணியை பட்டியலிடு
-Name[tr]=Liste Yazdırma Tarzı
-Name[uk]=Стиль друку списком
-Name[zh_CN]=列表打印样式
-Name[zh_TW]=清單列印風格
+
Comment=This plugin allows you to print out events and to-dos in list form.
-Comment[af]=Hierdie inprop module druk afsprake en te-doen items in lys vorm.
-Comment[bg]=Приставката служи за печат на събитията и задачите в списъчна форма.
-Comment[ca]=Aquest endollable permet imprimir esdeveniments i tasques pendents en forma de llista.
-Comment[cs]=tento modul umožňuje tisknout události a úlohy do seznamu.
-Comment[da]=Dette plugin gør at du kan udskrive begivenheder og opgaver på en liste.
-Comment[de]=Mit diesem Modul können Ereignisse und Aufgaben in Listenform ausgedruckt werden.
-Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε λίστες γεγονότων και προς υλοποίηση λίστες σε μορφή λίστας.
-Comment[es]=Esta extensión le permite imprimir eventos y tareas pendientes en forma de lista.
-Comment[et]=See plugin võimaldab trükkida sündmusi ja ülesandeid nimekirjana.
-Comment[eu]=Plugin honek gertaerak eta egitekoak zerrenda moduan inprimatzeko aukera ematen dizu.
-Comment[fa]=این وصله به شما اجازه می‌دهد که رویدادها و کارهای انجامی را در برگۀ فهرست چاپ کنید.
-Comment[fi]=Tämä liitännäinen mahdollistaa tapahtumien ja tehtävien tulostuksen listana.
-Comment[fr]=Ce module vous permet d'imprimer les évènements et les tâches sous forme de liste
-Comment[fy]=Dizze plugin makket it mooglik om eveneminten en taken yn list foar út te printen.
-Comment[gl]=Este plugin permítelle imprimir os eventos e as tarefas e forma de lista.
-Comment[hu]=Ezzel a modullal listaként kinyomtathatók a feladatok és események.
-Comment[is]=Þetta íforrit gerir þér kleyft að prenta út lista með atburðum og verkþáttum.
-Comment[it]=Questo plugin ti permette di stampare eventi e cose da fare in modalità elenco.
-Comment[ja]=このプラグインにより、リストフォーム内のイベントや To-Do を印刷できるようになります。
-Comment[kk]=Бұл оқиғалар мен жоспарларды тізім түрінде басатын модулі.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បោះពុម្ព​ព្រឹត្តិការណ៍ និង​ការងារ​ត្រូវ​ធ្វើក្នុង​ទម្រង់​ជា​បញ្ជី ។
-Comment[lt]=Šis priedas leidžia spausdinti įvykius ir darbus sąrašo forma.
-Comment[ms]=Plugin ini membenarkan anda mencetak peristiwa dan tugasan dalam borang senarai.
-Comment[nb]=Med dette programtillegget kan du skrive ut hendelser og gjørelister på liste-form.
-Comment[nds]=Mit dit Moduul köönt Begeefnissen un Opgaven as Listen utdruckt warrn.
-Comment[ne]=यो प्लगइनले तपाईँलाई घटना मुद्रण गर्न र सूची फारममा गर्नुपर्ने कार्यहरू गर्न अनुमति दिन्छ ।
-Comment[nl]=Deze plugin maakt het mogelijk om evenementen en taken in lijstvorm uit te printen.
-Comment[nn]=Dette programtillegget lèt deg skriva ut hendingar og hugselister på listeform.
-Comment[pl]=Ta wtyczka pozwala drukować zdarzenia i zadania w postaci listy.
-Comment[pt]=Este 'plugin' permite-lhe imprimir os eventos e os itens por-fazer no formato de uma lista.
-Comment[pt_BR]=Este plug-in permite que você imprima eventos e pendências em forma de lista.
-Comment[ru]=Этот модуль позволяет печатать список событий и задач.
-Comment[sk]=Tento modul umožní vytlačiť udalosti a úlohy vo forme zoznamu.
-Comment[sl]=Ta vstavek vam omogoča natis dogodkov in čakajočih opravil v obliki seznama.
-Comment[sr]=Овај прикључак вам омогућава да одштампате догађаје и обавезе у облику листе.
-Comment[sr@Latn]=Ovaj priključak vam omogućava da odštampate događaje i obaveze u obliku liste.
-Comment[sv]=Det här insticksprogrammet gör att du kan skriva ut händelser och uppgifter i en lista.
-Comment[ta]=இந்த சொருகுப்பொருள் பட்டியல் படிவத்தில் உள்ள செய்திகள் மற்றும் செய்யவேண்டியவைகளை அச்சிட உங்களை அனுமதிக்கிறது.
-Comment[tr]=Bu eklenti, olayları ve yapılacaklar listesini bir liste biçiminde yazdırmanızı sağlar.
-Comment[uk]=Цей втулок дозволяє друкувати події і завдання у вигляді списку.
-Comment[zh_CN]=此插件允许您以列表格式打印事件和待办事宜。
-Comment[zh_TW]=此外掛程式允許您以清單格式印出事件與待辦事項。
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index a3d4fb69..13922223 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -169,8 +169,7 @@
<tabstop>mToDate</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kdateedit.h</includehint>
- <includehint>kdateedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kdateedit.h</include>
+</includes>
</UI>
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop b/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
index 79dde69a..862ce375 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
@@ -1,92 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_whatsnextprint
+
Name=What's Next Print Style
-Name[af]=Wat is volgende - druk styl
-Name[bg]=Стил за отпечатване на "Какво следва"
-Name[ca]=Estil d'impressió Què toca ara?
-Name[cs]=Styl deníku - co je nového
-Name[da]=Hvad er det næste-udskriftsstil
-Name[de]=Was-kommt-als-nächstes Druckstil
-Name[el]=Στυλ εκτύπωσης 'Τί νέο υπάρχει'
-Name[eo]="Kio postsekvas"-Presostilo
-Name[es]=Estilo de impresión de «Qué es lo siguiente»
-Name[et]="Mis järgmiseks?" trükkimise stiil
-Name[eu]="Zer da hurrengoa" inprimatzeko estiloa
-Name[fa]=سبک چاپ بعدی چیست
-Name[fi]=Mitä seuraavaksi -tulostustyyli
-Name[fr]=Impression de la suite du programme
-Name[fy]=Printstyl foar Wat komt der no
-Name[gl]=Imprimir en Estilo Qué Vén Agora
-Name[hu]=A közeljövő eseményeinek kinyomtatása
-Name[is]=Hvað er næst prentstíll
-Name[it]=Stile di stampa "cosa viene dopo"
-Name[ja]=次は何? 印刷スタイル
-Name[kk]="Не істеу?" бетін басу стилі
-Name[km]=រចនាប័ទ្ម​បោះពុម្ព​ការងារ​បន្តបន្ទាប់
-Name[lt]=Ateinančių įvykių spausdinimo stilius
-Name[ms]=Gaya Cetak Apa Seterusnya
-Name[nb]=Utskriftsstil for Hva Nå
-Name[nds]=Druckstil för "Wat kummt nu"-Indrääg
-Name[ne]=पछिल्लो मुद्रण शैली कुन हो
-Name[nl]=Printstijl voor Wat komt er nu
-Name[nn]=Utskriftsstil for «Kva no»
-Name[pl]=Styl drukowania "Do dalej"
-Name[pt]=Estilo de Impressão "O Que Se Segue"
-Name[pt_BR]=Estilo de impressão "A Seguir"
-Name[ru]=Даджест
-Name[sk]=Štýl tlače Čo nasleduje
-Name[sl]=Slog tiskanja v obliki »Kaj je naslednje«
-Name[sr]=Стил штампе „Шта је следеће“
-Name[sr@Latn]=Stil štampe „Šta je sledeće“
-Name[sv]=Vad står på tur-utskriftsstil
-Name[ta]=அடுத்டு என்ன அச்சுப் பாணி
-Name[tr]=Sıradaki Nedir Yazdırma Tarzı
-Name[uk]=Стиль друку "Що далі?"
-Name[zh_CN]=下步安排打印样式
-Name[zh_TW]=「下一個是什麼」列印風格
+
Comment=This plugin allows you to print out a list of all upcoming events and to-dos.
-Comment[af]=Hierdie inprop module druk 'n lys van al die opkomende afsprake en te-doen itemme.
-Comment[bg]=Приставката служи за печат на бъдещи събития и задачи в списъчна форма.
-Comment[ca]=Aquest endollable us permet imprimir una llista de tots els esdeveniments i tasques pendents propers.
-Comment[cs]=Tento modul umožňuje tisk seznamu všech budoucích událostí a úkolů.
-Comment[da]=Dette plugin gør at du kan udskrive en liste med alle kommende begivenheder og opgaver.
-Comment[de]=Mit diesem Modul kann eine Liste der als nächstes anliegenden Ereignisse und Aufgaben gedruckt werden
-Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε μία λίστα γεγονότων ή προς υλοποίηση εργασιών.
-Comment[es]=Esta extensión le permite imprimir una lista de todos los eventos y tareas pendientes futuros.
-Comment[et]=See plugin võimaldab trükkida kõigi eelseisvate sündmuste ja ülesannete nimekirja.
-Comment[eu]=Plugin honek gertatuko diren gertaera eta egitekoen zerrenda bat inprimatzeko aukera ematen dizu.
-Comment[fa]=این وصله به شما اجازه می‌دهد که فهرستی از همۀ رویدادها و کارهای انجامی که بالا می‌آیند را چاپ کنید.
-Comment[fi]=Tämä liitännäinen mahdollistaa tulevien tapahtumien ja tehtävien tulostuksen listana.
-Comment[fr]=Ce module vous permet d'imprimer la liste des prochaines évènements et des prochaines tâches.
-Comment[fy]=Dizze plugin makket it mooglik om in list fan alle kommende eveneminten en taken út te printsjen.
-Comment[gl]=Este engadido permítelle imprimir unha lista de todos os eventos e tarefas por vir.
-Comment[hu]=Ezzel a modullal kinyomtathatók a rövidesen aktuálissá váló feladatok és események.
-Comment[is]=Þetta íforrit gerir þér kleyft að prenta út lista yfir alla væntanlega atburði og verkþætti.
-Comment[it]=Questo plugin vi permette di stampare una lista dei prossimi eventi e cose da fare.
-Comment[ja]=このプラグインにより、将来のすべてのイベントや To-Do のリストを印刷できるようになります。
-Comment[kk]=Бұл келер оқиғалар мен жоспарлар тізімін басып шығаратын модулі.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បោះពុម្ព​បញ្ជី​នៃ​ព្រឹត្តិការណ៍ និង​ការងារ​ត្រូវ​ធ្វើ​បន្តបន្ទាប់
-Comment[lt]=Šis priedas leidžia spausdinti sąrašą visų artėjančių įvykių ir darbų.
-Comment[ms]=Plugin ini membenarkan anda mencetak senarai semua peristiwa dan tugasan mendatang.
-Comment[nb]=Med dette programtillegget kan du skrive ut en liste over kommende hendelser og ting som skal gjøres.
-Comment[nds]=Mit dit Moduul kann en List vun de direktemang nakamen Begeefnissen un Opgaven utdruckt warrn.
-Comment[ne]=यो प्लगइनले तपाईँलाई सबै पछि हुने घटना र गर्नुपर्ने कार्यहरुको सूचीको मुद्रण गर्न अनुमति दिन्छ ।
-Comment[nl]=Deze plugin maakt het mogelijk om een lijst van alle komende evenementen en taken uit te printen.
-Comment[nn]=Dette programtillegget lèt deg skriva ut ei liste over alle dei komande hendingane og oppføringane i hugselista.
-Comment[pl]=Ta wtyczka pozwala wydrukować wszystkie przyszłe zdarzenia i zadania.
-Comment[pt]=Este 'plugin' permite-lhe imprimir uma lista com todos os eventos e itens por-fazer próximos.
-Comment[pt_BR]=Este plug-in permite que você imprima uma lista de todos os eventos e pendências que estão por vir.
-Comment[ru]=Этот модуль позволяет печатать список будущих событий и задач.
-Comment[sk]=Tento modul umožní vytlačiť zoznam všetkých nadchádzajúcich udalostí a úloh.
-Comment[sl]=Ta vstavek vam omogoča natis seznama vseh prihahajočih dogodkov in čakajočih opravil.
-Comment[sr]=Овај прикључак вам омогућава да одштампате листу свих наступајућих догађаја и обавеза.
-Comment[sr@Latn]=Ovaj priključak vam omogućava da odštampate listu svih nastupajućih događaja i obaveza.
-Comment[sv]=Det här insticksprogrammet gör att du kan skriva ut en lista med alla kommande händelser och uppgifter.
-Comment[ta]=இந்த சொருகுப்பொருள் ஒரு வரப்போகும் நிகழ்வுகளின் பட்டியல் மற்றும் செய்யவேண்டியவைகளை அச்சிட உங்களை அனுமதிக்கிறது.
-Comment[tr]=Bu eklenti, sıradaki olayları ve yapılacaklar listesini bir liste biçiminde yazdırmanızı sağlar.
-Comment[uk]=Цей втулок дозволяє друкувати список всіх майбутніх подій та завдань.
-Comment[zh_CN]=此插件允许您打印所有即将到达的事件和代办事宜。
-Comment[zh_TW]=此外掛程式允許您印出即將發生的事件與待辦事項清單。
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/printing/year/CMakeLists.txt b/korganizer/plugins/printing/year/CMakeLists.txt
index f3b9893e..a77a62f9 100644
--- a/korganizer/plugins/printing/year/CMakeLists.txt
+++ b/korganizer/plugins/printing/year/CMakeLists.txt
@@ -26,7 +26,11 @@ link_directories(
##### other data ################################
-install( FILES yearprint.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
+tde_create_translated_desktop(
+ SOURCE yearprint.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/korganizer
+ PO_DIR korganizer-desktops
+)
##### libkorg_yearlyprint (module) ##############
diff --git a/korganizer/plugins/printing/year/yearprint.desktop b/korganizer/plugins/printing/year/yearprint.desktop
index ad0f518d..fb56645d 100644
--- a/korganizer/plugins/printing/year/yearprint.desktop
+++ b/korganizer/plugins/printing/year/yearprint.desktop
@@ -1,81 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_yearlyprint
+
Name=Yearly Print Style
-Name[af]=Druk styl: Jaarliks
-Name[bg]=Стил за отпечатване на годишно разписание
-Name[ca]=Estil d'impressió anual
-Name[cs]=Roční tiskový styl
-Name[da]=Yearly udskriftsstil
-Name[de]=Jahres-Druckstil
-Name[el]=Στυλ ετήσιας εκτύπωσης
-Name[eo]=Pojara Presostilo
-Name[es]=Estilo de impresión del diario
-Name[et]=Aastakalendri trükkimise stiil
-Name[fa]=سبک چاپ نشریه
-Name[fr]=Impression annuelle
-Name[fy]=Printstyl foar jierkalinder
-Name[gl]=Estilo de impresión anual
-Name[hu]=Éves naptár nyomtatási stílus
-Name[it]=Stile di stampa annuale
-Name[ja]=年毎印刷スタイル
-Name[kk]=Жылдық басу стилі
-Name[km]=រចនាប័ទ្ម​បោះពុម្ព​ប្រចាំ​ឆ្នាំ
-Name[lt]=Metų spausdinimo stilius
-Name[nb]=Utskriftsstil for kalender
-Name[nds]=Johrkalenner-Druckstil
-Name[ne]=वार्षिक मुद्रण शैली
-Name[nl]=Printstijl voor jaarkalender
-Name[pl]=Styl drukowania roku
-Name[pt]=Estilo de Impressão em Anuário
-Name[pt_BR]=Estilo de Impressão de Calendário Anual
-Name[ru]=Календарь на год
-Name[sk]=Štýl tlače pre rok
-Name[sl]=Letni slog tiskanja
-Name[sr]=Годишњи стил штампе
-Name[sr@Latn]=Godišnji stil štampe
-Name[sv]=Årlig utskriftsstil
-Name[tr]=Yıllık Yazdırma Stili
-Name[uk]=Стиль друку щорічником
-Name[zh_CN]=按年打印样式
-Name[zh_TW]=年度列印風格
+
Comment=This plugin allows you to print out a yearly calendar.
-Comment[af]=Hierdie inprop module maak dit moontlik om 'n kalender vir 'n hele jaar te druk.
-Comment[bg]=Приставката служи за печат на годишния календар.
-Comment[ca]=Aquest endollable us permet imprimir un calendari anual.
-Comment[cs]=Tento modul umožňuje tisk ročního kalendáře.
-Comment[da]=Dette plugin gør at du kan udskrive en årlig kalender
-Comment[de]=Mit diesem Modul können Jahresübersichten gedruckt werden.
-Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώσετε ένα ετήσιο ημερολόγιο.
-Comment[es]=Este plugin le permite imprimir entradas del diario.
-Comment[et]=See plugin võimaldab trükkida terve aasta kalendri.
-Comment[fa]=این وصله، به شما اجازه می‌دهد که مدخلهای نشریه )مدخلهای روزانه( را چاپ کنید.
-Comment[fr]=Ce module vous permet d'imprimer l'ensemble de l'année
-Comment[fy]=Dizze plugin makket it mooglik om in jierkalinder út te printsjen.
-Comment[gl]=Este engadido permítelle imprimir un calendario anual.
-Comment[hu]=Ez a modul egy egész éves naptár kinyomtatását teszi lehetővé.
-Comment[it]=Questo plugin ti permette di stampare un calendario annuale.
-Comment[ja]=このプラグインにより、年毎のカレンダーを印刷できるようになります。
-Comment[kk]=Бұл жылдық күнтізбені басып шығаратын модулі.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​បោះពុម្ព​​ប្រតិទិន​ប្រចាំ​ឆ្នាំ ។
-Comment[lt]=Šis priedas leidžia spausdinti metų kalendorių.
-Comment[mk]=Овој приклучок Ви овозможува да испечатите годишен календар.
-Comment[nb]=Med dette programtillegget kan du skrive ut en årskalender.
-Comment[nds]=Mit dit Moduul kannst Du en Kalenner för't hele Johr utdrucken.
-Comment[ne]=यो प्लगइनले तपाईँलाई वार्षिक पात्रो मुद्रण गर्न अनुमति दिन्छ ।
-Comment[nl]=Deze plugin maakt het mogelijk om een jaarkalender af te drukken.
-Comment[pl]=Ta wtyczka pozwala drukować roczny kalendarz.
-Comment[pt]=Este 'plugin' permite-lhe imprimir um calendário anual.
-Comment[pt_BR]=Este plug-in permite imprimir um calendário anual.
-Comment[ru]=Этот модуль позволяет печатать календарь на год.
-Comment[sk]=Tento modul vám umožní vytlačiť kalendár na rok.
-Comment[sl]=Ta vstavek vam omogoča natis letnega koledarja.
-Comment[sr]=Овај прикључак вам омогућава да одштампате годишњи календар.
-Comment[sr@Latn]=Ovaj priključak vam omogućava da odštampate godišnji kalendar.
-Comment[sv]=Det här insticksprogrammet gör att du kan skriva ut en årlig kalender.
-Comment[tr]=Bu eklenti, yıllık takvimi yazıcıdan çıkartmanızı sağlar.
-Comment[uk]=Цей журнал надає можливість друкувати щорічний календар.
-Comment[zh_CN]=此插件允许您打印年历。
-Comment[zh_TW]=此外掛程式讓您印出年曆。
+
Type=Service
X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 033b6ba6..8b0e5cbf 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -79,15 +79,15 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
TQPushButton *zoomIn = new TQPushButton(i18n("Zoom In"),this);
topBar->addWidget(zoomIn,0);
- connect(zoomIn,TQT_SIGNAL(clicked()),TQT_SLOT(zoomIn()));
+ connect(zoomIn,TQ_SIGNAL(clicked()),TQ_SLOT(zoomIn()));
TQPushButton *zoomOut = new TQPushButton(i18n("Zoom Out"),this);
topBar->addWidget(zoomOut,0);
- connect(zoomOut,TQT_SIGNAL(clicked()),TQT_SLOT(zoomOut()));
+ connect(zoomOut,TQ_SIGNAL(clicked()),TQ_SLOT(zoomOut()));
TQPushButton *menuButton = new TQPushButton(i18n("Select Mode"),this);
topBar->addWidget(menuButton,0);
- connect(menuButton,TQT_SIGNAL(clicked()),TQT_SLOT(showModeMenu()));
+ connect(menuButton,TQ_SIGNAL(clicked()),TQ_SLOT(showModeMenu()));
createMainTask();
@@ -239,8 +239,8 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt,
endDt);
- connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
- TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change)));
+ connect(task,TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)),
+ TQ_SLOT(taskChanged(KGanttItem*,KGanttItem::Change)));
if (todo->relations().count() > 0) {
task->setBrush(TQBrush(TQColor(240,240,240), TQBrush::Dense4Pattern));
}
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 5415d381..fada01d5 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -65,7 +65,7 @@ class KOProjectViewItem : public KGanttItem {
*/
class KOProjectView : public KOrg::BaseView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 );
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 60257623..db354184 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) :
setXMLFile("plugins/projectviewui.rc");
- new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()),
+ new TDEAction(i18n("&Project"), "project", 0, this, TQ_SLOT(showView()),
actionCollection(), "view_project");
}
diff --git a/korganizer/plugins/projectview/projectview.desktop b/korganizer/plugins/projectview/projectview.desktop
index f687fe0d..b09ca6a8 100644
--- a/korganizer/plugins/projectview/projectview.desktop
+++ b/korganizer/plugins/projectview/projectview.desktop
@@ -1,109 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_projectview
+
Name=Project View Plugin for KOrganizer
-Name[af]=Projek Besigtig Inplak vir Korganizer
-Name[az]=KOrganizer Layihə Nümayiş Əlavəsi
-Name[bg]=Приставка на организатора за преглед на проекти
-Name[br]=Lugent gwell raktres evit KOrganizer
-Name[bs]=Preglednik projekata, dodatak za KOrganizer
-Name[ca]=Endollable de vista de projectes per a KOrganizer
-Name[cs]=Modul projektového pohledu pro KOrganizer
-Name[cy]=Ategyn Golwg Cywaith ar gyfer KTrefnydd
-Name[da]=Projektvisning-plugin for KOrganizer
-Name[de]=Projektbetrachter-Modul für KOrganizer
-Name[el]=Πρόσθετο προβολής έργου του KOrganizer
-Name[eo]=Projektrigardo-kromaĵo por Organizilo
-Name[es]=Plugin de visor de proyectos para KOrganizer
-Name[et]=KOrganizeri projektivaate plugin
-Name[eu]=KOrganizer-en proiektu ikuspegi plugin-a
-Name[fa]=وصلۀ نمای پروژه برای KOrganizer
-Name[fi]=Projektinäkymäliitännäinen KOrganizeriin
-Name[fr]=Module afficheur de projet pour KOrganizer
-Name[fy]=Projektwerjefteplugin foar KOrganizer
-Name[gl]=Extensión para Vista de Proxecto para KOrganizer
-Name[he]=תוסף תצוגת פרוייקט ל-KOrganizer
-Name[hi]=के-आर्गेनाइज़र के लिए परियोजना दृश्य प्लगइन
-Name[hr]=KOrganizer dodatak za pogled na projekt
-Name[hu]=Projektnézegető bővítőmodul a KOrganizerhez
-Name[is]=Verkefnasýnaríforrit fyrir KOrganizer
-Name[it]=Plugin di vista dei progetti per KOrganizer
-Name[ja]=KOrganizer プロジェクトビュー プラグイン
-Name[ka]= KOrganizer-ის პროექტის ხედის მოდული
-Name[kk]=KOrganizer-дің жоба көрінісінің модулі
-Name[km]=កម្មវិធី​ជំនួយ​ទិដ្ឋភាព​គម្រោង​សម្រាប់ KOrganizer
-Name[lt]=Projekto peržiūros priedas, skirtas KOrganizer
-Name[lv]=Projekta Skatījuma Iespraudnis KOrganaizeram
-Name[ms]=Plugin Paparan Projek untuk KOrganizer
-Name[nb]=Programtillegg for prosjektvisning i KOrganizer
-Name[nds]=Projektkieker-Moduul för KOrganizer
-Name[ne]=केडीई आयोजकका लागि परियोजना दृश्य प्लगइन
-Name[nl]=Projectenweergaveplugin voor KOrganizer
-Name[nn]=Programtillegg for prosjektvising i KOrganizer
-Name[nso]=Plugin ya Pono ya Porojeke ya KMmeakanyi
-Name[pl]=Wtyczka przeglądania projektów dla Organizatora
-Name[pt]='Plugin' de Gestão de Projectos para o KOrganizer
-Name[pt_BR]=Plug-in de Visualização de Projetos para o KOrganizer
-Name[ro]=Modul vizualizare proiect pentru KOrganizer
-Name[ru]=Просмотр проекта
-Name[sk]=KOrganizer modul pre projektový pohľad
-Name[sl]=Vstavek za projektni prikaz za KOrganizer
-Name[sr]=Прикључак KOrganizer-а за приказ пројекта
-Name[sr@Latn]=Priključak KOrganizer-a za prikaz projekta
-Name[sv]=Projektvyinsticksprogram för Korganizer
-Name[ta]=கேஅமைப்பாளருக்கான திட்டக் காட்சி சொருகுப்பொருள்
-Name[tg]=Намоиши нақшот
-Name[tr]=KOrganizer için Proje Görüntüleme eklentisi
-Name[uk]=Втулок перегляду проектів для KOrganizer
-Name[ven]=Plugin ya mbonalelo ya phurodzhekiti ya mudzudzanyi wa K
-Name[vi]=Plugin xem dự án cho KOrganizer
-Name[xh]=Iprojekthi Ijongela KOrganize i Plugin
-Name[zh_CN]=KOrganizer 的项目查看插件
-Name[zh_TW]=KOrganizer 專案檢視外掛程式
-Name[zu]=Project Khombisa Iplagi ye KUmgqugquzeli
+
Comment=This plugin provides a project planning view for KOrganizer (like the to-do or month views). If you enable this plugin, you can switch to the project view and view your to-do list like in a project planner.
-Comment[af]=Hierdie inprop module verskaf 'n projek beplanning aansig vir KOrganizer. Dit lyk baie soos die te-doen of maand aansig. As hierdie inprop module geaktiveer is, kan jy na die projek aansig wissel en na jou te-doen in projek beplanner formaat kyk.
-Comment[bg]=Приставката служи за планиране и управление на проекти.
-Comment[ca]=Aquest endollable proporciona una vista de planificació de projectes per a KOrganizer (com ara les vistes de pendents o mensual). Si habiliteu aquest endollable, podeu canviar a la vista de projecte i veure la llista de tasques pendents com en un planificador de projectes.
-Comment[cs]=Tento modul poskytuje projektový pohled pro KOrganizer (podobnějako úkoly nebo měsíční pohled). Pokud jej povolíte, může přepnout do projektového pohledu a prohlížet si úkoly jako v projektovém plánovači.
-Comment[da]=Dette plugin sørger for en projektplanvisning i Korganizer (som ligner gøremål eller månedsvisning). Hvis du aktiverer dette plugin kan du skifte til projektvisning og vise din gøremålsliste som i et projektplan-værktøj.
-Comment[de]=Mit diesem Modul wird KOrganizer um eine Projektplanungsansicht (ähnlich der Aufgaben- und Monatsansicht) erweitert. Wenn Sie es einschalten, können Sie zur Projektansicht wechseln und sich Ihre Aufgaben wie in einem Projektplaner ansehen.
-Comment[el]=Αυτό το πρόσθετο παρέχει μία προβολή σχεδιασμού έργου για το KOrganizer (όπως η προβολή προς υλοποίηση εργασιών και μηνών). Αν το ενεργοποιήσετε, μπορείτε να αλλάξετε στην προβολή έργου και να δείτε τη λίστα των προς υλοποίηση εργασιών σας σαν σε ένα προγραμματιστή έργου.
-Comment[es]=Esta extensión proporciona una vista de planificación de proyectos para KOrganizer (como las vistas de tareas pendientes o de mes). Si activa esta extensión, puede pasar a la vista del proyecto y ver la lista de tareas pendientes como en un planificador de proyectos.
-Comment[et]=See plugin lisab KOrganizerile projekti planeerimise vaate (nagu ülesannete või kuuvaade). Selle lubamisel saab lülituda projektivaatele ning näha oma ülesannete nimekirja projektiplaneerija moodi.
-Comment[eu]=Plugin honek KOrganizer-en proiektuaren plangintza ikuspegi bat eskeintzen du (egiteko edo hilabete ikupegien antzera). Plugin hau gaitzen baduzu, proiektuaren ikuspegira alda zaitezke eta egitekoak proiektu plangintza batean bezala ikus dezakezu.
-Comment[fa]=این وصله، برای KOrganizer یک نمای طراحی پروژه )مثل نماهای کارهای انجامی یا ماهانه( فراهم می‌‌کند. اگر این وصله را فعال کنید، می‌توانید به نمای پروژه سودهی کرده و مانند طراح پروژه، فهرست کارهای انجامی خود را مشاهده کنید.
-Comment[fi]=Tämä liitännäinen mahdollistaa projektin suunnittelunäkymän KOrganizeriin (kuten tehtävälista- tai kuukausinäkymän). Jos kytket tämän päälle, voit vaihtaa projektinäkymään ja katsoa tehtävälistaa kuten projektin suunnittelussa.
-Comment[fr]=Ce module propose une vue en projet pour KOrganizer. Si vous activez ce module, vous pourrez afficher vos tâches sous la forme d'un planning projet.
-Comment[fy]=Dizze plugin jout jo in projektwerjefte foar KOrganizer (krekt as in takenlist of moannewerjefte). Wannear jo dizze plugin ynskeakelje, kinne jo dizze werjefte oansette om jo takenlist te besjen as projektplanner.
-Comment[gl]=Este engadido fornece unha vista planificadora de proxectos para KOrganizer (como as vistas de tarefas ou mensuais). Se habilita este engadid, pode trocar á vista de proxecto e ver a súa lista de tarefas nun planificador de proxectos.
-Comment[hu]=Ezzel a modullal projekttervező nézet alakítható ki a KOrganizerben (például a feladatokhoz vagy a havi nézetekhez). Ha aktiválja ezt a modult, átválthat projektnézetbe, hogy a feladatok projekttervként legyenek megtekinthetők.
-Comment[is]=Þetta íforrit veitir verkskipulagssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta íforrit, getur þú á einfaldan hátt skipt yfir í verkefnasýn og skoðað verkþáttalistann þinn í skipuleggjara.
-Comment[it]=Questo plugin fornisce una vista di pianificazione progetto per KOrganizer (come la vista delle cose da fare o quella mensile). Se abiliti questo plugin, puoi passare dalla vista progetto alla vista delle cose da fare come in un pianificatore di progetti.
-Comment[ja]=このプラグインは KOrganizer にプロジェクト計画ビューを提供します (To-Do ビューや月ビューなど)。このプラグインを有効にすると、プロジェクトビューに切り替えて、スケジュール管理ソフトのように To-Do リストを見ることができます。
-Comment[ka]=ეს მოდული უზრუნველყოფს პროექტის დაგეგმარების ხედს KOrganizer-სთვის(მაგ.: დავალებები ან თვიური მიმოხილვა). თუ ამ მოდულს გაააქტიურებთ,შეგიძლიათ გადართოთ პროექტის ხედზე და იხილოთ თქვენი დავალებათა სია პროექტის მგეგმავის სახით.
-Comment[kk]=Бұл KOrganizer-нің жобаны жоспарлау көрінісінің модулі. Модулін орнатсаңыз, осы көрініске ауысып жоспар тізімініңізді жоба жоспарлағышындағы түріне келтіре аласыз.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​ផ្ដល់​នូវ​ទិដ្ឋភាព​រៀបចំ​គម្រោង​សម្រាប់ korganizer (ដូចជា ទិដ្ឋភាព​ការងារ​ត្រូវ​ធ្វើ ឬ ទិដ្ឋភាព​ខែ​ជាដើម) ។ បើ​អ្នក​ធ្វើ​ឲ្យ​កម្មវិធី​ជំនួយ​នេះ​ប្រើ​បាន អ្នក​នឹង​អាច​ប្ដូរ​ទិដ្ឋភាព​គម្រោង ហើយ​មើល​ព្រឹត្តិការណ៍​របស់​អ្នក​ដូចជា​នៅ​ក្នុងកម្មវិធី​រៀបចំ​គម្រោង​អញ្ចឹង​ដែរ ។
-Comment[lt]=Šis priedas pateikia KOrganizaer projekto planavimo vaizdą (panašiai kaip darbų ar mėnesio vaizdai). Jei įjungsite šį įskiepį, galėsite peršokti į projekto vaizdą ir peržiūrėti savo darbų sąrašą kaip projektą.
-Comment[ms]=Plugin ini menyediakan paparan perancangan projek untuk KOrganizer (seperti tugasan atau paparan bulan). Jika plugin ini diaktifkan, anda boleh beralih ke paparan projek dan paparkan senarai tugasan seperti dalam perancang projek.
-Comment[nb]=Dette programtillegget lager en prosjektplan-visning for KOrganizer (som i gjørelister og månedsvisninger). Slår du på dette programtillegget kan du bytte til prosjektvisning og se på gjørelista som i en prosjektplan.
-Comment[nds]=Mit dit Moduul kannst Du in KOrganizer en Projektplaan-Ansicht opropen (jüst as de Opgaven- oder Maandansichten). Wenn Du dit Moduul aktiveerst, kannst Du na de Projektansicht wesseln un Dien Opgavenlist as mit en Projektplaner ankieken.
-Comment[ne]=यो प्लगइनले केडीई आयोजकका लागि परियोजना योजना दृश्य उपलब्ध गराउछ (जस्तै: कार्य गर्न वा महिना हेर्न) । तपाईँले यो प्लगइन सक्षम पारेमा, परियोजना दृश्यमा स्विच गर्न र परियोजना योजनाकारमा जस्तै तपाईँको कार्य गर्ने सूची हेर्न सक्नुहुन्छ ।
-Comment[nl]=Deze plugin biedt een projectweergave voor KOrganizer (net zoals een takenlijst of maandweergave). Wanneer u deze plugin aanzet, kunt u deze weergave aanzetten om uw takenlijst te bekijken als een projectplanner.
-Comment[nn]=Dette programtillegget lagar ei prosjektplanvising for KOrganizer (slik som oppgåve- eller månadsvisingane). Dersom du brukar dette programtillegget, kan du visa oppgåvelista som i ein prosjektplanleggjar.
-Comment[pl]=Ta wtyczka tworzy widok planowania projektu w KOrganizerze (tak jak widok zadań do zrobienia lub widok miesiąca). Po włączeniu tej wtyczki możliwe jest przełączenie się na widok projektu zadań do zrobienia.
-Comment[pt]=Este 'plugin' oferece uma vista de planeamento de projectos para o KOrganizer (como as vistas de itens por-fazer ou mensais). Se activar este 'plugin', poderá mudar para a vista de projecto e ver a sua lista de itens por-fazer como num planeador de projectos.
-Comment[pt_BR]=Este plug-in fornece uma visão de planejamento de projeto para o KOrganizer (como as visões de pendências ou de mês). Se você ativar este plugin, você pode mudar para a visão de projeto e ver a sua lista de pendências como num software de planejamento de projetos.
-Comment[ru]=Этот модуль показывает проект для органайзера TDE. Если вы подключите этот модуль, вы можете посмотреть ваши задачи в виде проекта.
-Comment[sk]=Tento modul poskytuje pohľad na plánovanie projektu pre KOrganizer (ako sú úlohy alebo mesačné pohľady). Ak povolíte tento modul, môžete prepínať projektový pohľad a pohľad na zoznam úloh ako plánovač projektu.
-Comment[sl]=Ta vstavek prikazuje projektno načrtovanje za KOrganizer (kot prikaz opravil ali mesečni prikaz). Če omogočite ta vstavek, lahko preklopite na projektni prikaz in si ogledate seznam opravil kot v projektnem prikazu.
-Comment[sr]=Овај прикључак пружа приказ планирања пројекта за KOrganizer (као месечни или прикази обавеза). Ако укључите овај прикључак, можете се пребацити на приказ пројекта и разгледати своју листу послова у планеру пројекта.
-Comment[sr@Latn]=Ovaj priključak pruža prikaz planiranja projekta za KOrganizer (kao mesečni ili prikazi obaveza). Ako uključite ovaj priključak, možete se prebaciti na prikaz projekta i razgledati svoju listu poslova u planeru projekta.
-Comment[sv]=Insticksprogrammet tillhandahåller en projektplaneringsvy i Korganizer (som liknar uppgifts- eller månadsvyn). Om du aktiverar insticksprogrammet kan du byta till projektvyn och visa din uppgiftslista som i ett projektplaneringsverktyg.
-Comment[ta]=இந்த சொருகுப்பொருள் KOrganizer-க்கான ஒரு திட்டப்பணி செய்யும் காட்சியை வழங்குகிறது. (செய்யவேண்டியது அல்லது மாத காட்சிகள் போன்ற). இது செயலில் இருந்தால், நீங்கள் திட்டக்காட்சிக்கு செல்லலாம் திட்ட அமைப்பான் போன்ற திட்டக் காட்சிக்கும் செல்லலாம்.
-Comment[tr]=Bu eklenti, KOrganizer için bir proje planı görünümü sağlar (yapılacaklar ve aylık görünüm gibi). Eğer bu eklentiyi aktif hale getirirseniz, proje görünümüne geçebilir ve yapılacaklar listenizi proje planlayıcısı şeklinde görüntüleyebilirsiniz.
-Comment[uk]=Цей втулок показує вигляд планування проектів у KOrganizer (подібно до виглядів завдань або місячного). Якщо увімкнути цей втулок, то можна переглядати ваш список завдань у вигляді плановика проектів.
-Comment[zh_CN]=此插件为 KOrganizer 提供了项目规划视图(类似于待办或月视图)。如果您启用了此插件,您可以像项目规划程序那样切换到项目视图并查看您的待办清单。
-Comment[zh_TW]=此外掛程式提供 KOrganizer 專案計畫檢視。如果您開啟此外掛程式,您可以切換專案檢視與待辦事項清單。
+
Type=Service
X-TDE-ServiceTypes=KOrganizer/Part
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h
index 1c78ad84..cbb0e8f0 100644
--- a/korganizer/plugins/projectview/projectview.h
+++ b/korganizer/plugins/projectview/projectview.h
@@ -24,7 +24,7 @@
#include <korganizer/calendarviewbase.h>
class ProjectView : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
ProjectView(KOrg::MainWindow *, const char *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 8445edf4..00910bfe 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -44,7 +44,7 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent,
mTimeSpanWidget = new TimeSpanWidget( this );
topLayout->addWidget( mTimeSpanWidget );
- connect( mTimeSpanWidget, TQT_SIGNAL( dateRangeChanged() ), TQT_SLOT( updateView() ) );
+ connect( mTimeSpanWidget, TQ_SIGNAL( dateRangeChanged() ), TQ_SLOT( updateView() ) );
}
KOTimeSpanView::~KOTimeSpanView()
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index b9dec86a..2e487880 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -31,7 +31,7 @@ class TimeSpanWidget;
class KOTimeSpanView : public KOEventView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0,
diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h
index 5db02c09..26944153 100644
--- a/korganizer/plugins/timespanview/lineview.h
+++ b/korganizer/plugins/timespanview/lineview.h
@@ -29,7 +29,7 @@
class LineView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
LineView( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h
index 0cb9ad5b..47d3a5d9 100644
--- a/korganizer/plugins/timespanview/timeline.h
+++ b/korganizer/plugins/timespanview/timeline.h
@@ -29,7 +29,7 @@
class TimeLine : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeLine( TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 4b3df7ef..5ff4cf0a 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) :
setXMLFile( "plugins/timespanviewui.rc" );
- new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ),
+ new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQ_SLOT( showView() ),
actionCollection(), "view_timespan" );
}
diff --git a/korganizer/plugins/timespanview/timespanview.desktop b/korganizer/plugins/timespanview/timespanview.desktop
index 509e1a79..bc1e7958 100644
--- a/korganizer/plugins/timespanview/timespanview.desktop
+++ b/korganizer/plugins/timespanview/timespanview.desktop
@@ -1,91 +1,10 @@
[Desktop Entry]
X-TDE-Library=libkorg_timespanview
+
Name=Timespan View Plugin for KOrganizer
-Name[af]=Tydlyn aansig inprop module vir KOrganizer
-Name[bg]=Приставка за разпределението на времето в организатора
-Name[ca]=Endollable de vista de període temporal per a KOrganizer
-Name[cs]=Modul časového pohledu pro KOrganizer
-Name[da]=Timespan-visning-plugin for KOrganizer
-Name[de]=Zeitspannenansicht-Modul für KOrganizer
-Name[el]=Πρόσθετο προβολής εργασιών του KOrganizer
-Name[eo]=Tempgamrigardo-kromaĵo por Organizilo
-Name[es]=Extensión de visor de Timespan para KOrganizer
-Name[et]=KOrganizeri perioodivaate plugin
-Name[eu]=KOrganizer-rako denbora-barruti ukuspegi plugin-a
-Name[fa]=وصلۀ نمای گسترۀ زمان برای KOrganizer
-Name[fi]=Ajankulkunäkymäliitännäinen Korganizeriin
-Name[fr]=Module d'affichage de planification pour KOrganizer
-Name[fy]=Tiidspanneplugin foar KOrganizer
-Name[gl]=Extensión de Vista en Unidades de Tempo para KOrganizer
-Name[hu]=Időszakáttekintő bővítőmodul a KOrganizerhez
-Name[is]=Tímabilsskoðunar íforrit fyrir KOrganizer
-Name[it]=Plugin vista intervalli temporali per KOrganizer
-Name[ja]=KOrganizer タイムスパンビュー プラグイン
-Name[kk]=KOrganizer-дің уақыт аралығы көрініс модулі
-Name[km]=កម្មវិធី​ជំនួយ​ទិដ្ឋភាព​រយៈពេល​សម្រាប់ KOrganizer
-Name[lt]=Laiko tarpsnio vaizdo KOrganizer priedas
-Name[ms]=Plugin Paparan Kitar Waktu untuk KOrganizer
-Name[nb]=Programtillegg for periodevisning i KOrganizer
-Name[nds]=Tietbruuk-Moduul för KOrganizer
-Name[ne]=केडीई आयोजकका लागि समयावधि दृश्य प्लगइन
-Name[nl]=Tijdspanneplugin voor KOrganizer
-Name[nn]=Programtillegg for tidsromsvising i KOrganizer
-Name[pl]=Wtyczka widoku zakresu czasu dla KOrganizera
-Name[pt]='Plugin' de Vista de Intervalo de Tempo para o KOrganizer
-Name[pt_BR]=Plug-in de Visualização de Período de Tempo Para o KOrganizer
-Name[ru]=Диаграмма Ганта для KOrganizer
-Name[sk]=KOrganizer modul pre projektový pohľad
-Name[sl]=Vstavek za časovni prikaz za KOrganizer
-Name[sr]=Прикључак KOrganizer-а за приказ временског распона
-Name[sr@Latn]=Priključak KOrganizer-a za prikaz vremenskog raspona
-Name[sv]=Tidsintervallvyinsticksprogram för Korganizer
-Name[ta]=கேஅமைப்பாளருக்கான திட்டக் காட்சி சொருகுப்பொருள்
-Name[tr]=KOrganizer için Zaman Dilimi Görünümü Eklentisi
-Name[uk]=Втулок перегляду періоду часу для KOrganizer
-Name[zh_CN]=KOrganizer 的时间跨度查看插件
-Name[zh_TW]=KOrganizer 時間檢視外掛程式
+
Comment=This plugin provides a timespan view for korganizer (like the to-do or month views). If you enable this plugin, you can switch to the timespan view and view your events like in a Gantt diagram.
-Comment[af]=Hierdie inprop module verskaf 'n tydlyn aansig vir KOrganizer. Dit lyk baie soos die te-doen of maand aansig. As hierdie inprop module geaktiveer is, kan jy na die tydlyn aansig wissel en na jou te-doen lys in tydlyn formaat kyk.
-Comment[bg]=Приставката служи за преглед на събитията и задачите в зададен период от време.
-Comment[ca]=Aquest endollable proporciona una vista d'un període temporal per a KOrganizer (com ara les vistes de pendents o mensual). Si habiliteu aquest endollable, podeu canviar a la vista de període temporal i veure els esdeveniments com en un diagrama de Gantt.
-Comment[cs]=Tento modul umožňuje časový pohled pro korganizer (podobně jako úkoly nebo měsíční pohled). Pokud ho povolíte, můžete se přepnout na časový pohled a prohlížet si události v Ganttově diagramu.
-Comment[da]=Pluginnet sørger for en tidsintervalsvisning i Korganizer (som ligner gøremål eller månedsvisning). Hvis du aktiverer dette plugin kan du skifte til tidsintervalvisning og vise dine begivenheder som i et Gantt-diagram.
-Comment[de]=Mit diesem Modul wird KOrganizer um eine Zeitspannenansicht (ähnlich der Aufgaben- und Monatsansicht) erweitert. Wenn Sie es einschalten, können Sie zur Zeitspannenansicht wechseln und sich Ihre Ereignisse wie in einem Gantt-Diagramm ansehen.
-Comment[el]=Αυτό το πρόσθετο παρέχει μία προβολή 'ανοίγματος' χρόνου για το korganizer (όπως οι μηνιαίες προβολές των προς υλοποίηση εργασιών). Αν το ενεργοποιήσετε, μπορείτε να αλλάξετε σε προβολή 'ανοίγματος' χρόνου και να δείτε τα γεγονότα σας όπως ένα διάγραμμα του Gantt.
-Comment[es]=Esta extensión proporciona una vista de timespan para korganizer (como la vista de tareas pendientes o la mensual). Si activa esta extensión, puede pasar a la vista de timespan y ver sus eventos como un diagrama de Gantt.
-Comment[et]=See plugin lisab KOrganizerile perioodivaate (nagu ülesannete või kuuvaade). Selle lubamisel saab lülituda perioodivaatele ning näha oma sündmusi Gantti diagrammina.
-Comment[eu]=Plugin honek KOrganizer-entzat denbora barruti ikuspegi bat eskeintzen du. Plugin hau gaitzen baduzu denbora-barruti ikuspegira alda zaitezke gertaerak Gantt diagrama batean bezala ikusi.
-Comment[fa]=این وصله، برای KOrganizer یک نمای گسترۀ زمان )مثل نماهای کارهای انجامی یا ماهانه( فراهم می‌‌کند. اگر این وصله را فعال کنید، می‌توانید به گسترۀ زمان سودهی کرده و مانند نمودار Gantt، رویدادهای خود را مشاهده کنید.
-Comment[fi]=Tämä liitännäinen mahdollistaa ajankulkunäkymän KOrganizeriin (kuten tehtävälista- tai kuukausinäkymän). Jos kytket tämän päälle, voit vaihtaa ajankulkunäkymään ja katsoa tapahtumia kuten Gantt-diagrammissa.
-Comment[fr]=Ce module vous permet d'avoir une vue de KOrganizer qui affiche les évènements selon l'axe temporel. Si vous activez cette vue, vous verrez vos évènements comme un diagramme de Gantt.
-Comment[fy]=Dizze plugin jout in werjefte foar KOrganizer (lykas de takenlist en de moannewerjefte). Wannear jo dizze plugin ynskeakelje kinne jo kieze foar in werjefte wêryn jo eveneminten yn in Gantt-diagram besjen kinne.
-Comment[gl]=Esta extensión fornece unha vista en unidades de tempo (como as vistas mensuais e a vista de tarefas). Se habilita esta extensión, pode trocar a vista en unidades de tempo e ver os seus eventos como un diagrama Gantt.
-Comment[hu]=Ezzel modullal egy időszakot lehet áttekinteni a KOrganizerben (például a feladatokat vagy a havi nézeteket). Ha aktiválja ezt a modult, átválthat időszakos nézetbe, hogy az események Gantt-diagramon legyenek megtekinthetők.
-Comment[is]=Þetta íforrit veitir tímabilssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta íforrit getur þú skipt yfir í tímabilssýn og skoðað atburðina þína eins og á Gantt skýringarmynd.
-Comment[it]=Questo plugin fornisce una vista a intervalli temporali. Se abiliti questo plugin, potrai passare alla vista a intervalli temporali e vedere i tuoi eventi come in un diagramma di Gantt.
-Comment[ja]=このプラグインは KOrganizer にタイムスパンビューを提供します (To-Do ビューや月ビューなど)。このプラグインを有効にすると、タイムスパンビューに切り替えて、ガントチャートのようにイベントを見ることができます。
-Comment[kk]=Бұл KOrganizer-нің уақыт аралығы көрінісінің модулі. Модулін орнатсаңыз, осы көрініске ауысып оқиғаларыңызды Гант диаграмма түріне келтре аласыз.
-Comment[km]=កម្មវិធី​ជំនួយ​នេះ​ផ្ដល់​នូវ​ទិដ្ឋភាព​រយៈពេល​សម្រាប់ korganizer (ដូចជា ទិដ្ឋភាព​ការងារ​ត្រូវ​ធ្វើ ឬ ទិដ្ឋភាព​ខែ​ជាដើម) ។ បើ​អ្នក​ធ្វើ​ឲ្យ​កម្មវិធី​ជំនួយ​នេះ​ប្រើ​បាន អ្នក​នឹង​អាច​ប្ដូរ​ទិដ្ឋភាព​រយៈពេល ហើយ​មើល​ព្រឹត្តិការណ៍​របស់​អ្នក​ដូចជា​នៅ​ក្នុងដ្យាក្រាម Gantt អញ្ចឹង​ដែរ ។
-Comment[lt]=Šis priedas korganizer programoje sudaro galimybę apžvelgti laiko tarpą (pvz., darbų arba mėnesio peržiūra). Įgalinus šį priedą galėsite persijungti į laiko tarpo peržiūrą ir žiūrėti įvykius tarsi Gantt diagramoje.
-Comment[ms]=Plugin ini menyediakan paparan kitar waktu untuk korganizer (seperti tugasan atau paparan bulan). Jika plugin ini diaktifkan,anda boleh beralih ke paparan kitar masa dan paparkan peristiwa seperti dalam diagram Gantt.
-Comment[nb]=Dette programtillegget lager en periodevisning for korganizer (slik som gjøreliste og månedsvisning). Hvis du slår på dette programtillegget kan du bytte til periodevisning og se hendelser som i et Gantt-diagram.
-Comment[nds]=Mit dit Moduul kannst Du in KOrganizer en Tietbruuk-Ansicht opropen (jüst as de Opgaven- oder Maandansichten). Wenn Du dit Moduul aktiveerst, kannst Du na de Tietbruukansicht wesseln un Dien Begeefnissen as Ganntt-Diagramm ankieken.
-Comment[ne]=यो प्लगइनले केडीई आयोजकका लागि समयावधि उपलब्ध गराउछ (गर्नुपर्ने कार्य वा महिना दृश्य जस्तो) । तपाईँले यो प्लगइन सक्षम पारेमा, तपाईँले समयावधि दृश्यमा स्वीच गर्न र गान्ट रेखाचित्र जस्तोमा घटना हेर्न सक्नुहुन्छ ।
-Comment[nl]=Deze plugin biedt een weergave voor KOrganizer (zoals de takenlijst en de maandweergave). Wanneer u deze plugin inschakelt kunt u kiezen voor een weergave waarin u uw evenementen in een Gantt-diagram kunt bekijken.
-Comment[pl]=Ta wtyczka tworzy widok zakresu czasu w KOrganizerze (tak jak widok zadań do zrobienia lub widok miesiąca). Po włączeniu tej wtyczki możliwe jest przełączenie się na widok zakresu czasu i przeglądanie zdarzeń jak na diagramie Gantta.
-Comment[pt]=Este 'plugin' oferece uma vista de distribuição temporal para o KOrganizer (como as vistas de itens por-fazer ou mensais). Se activar este 'plugin', poderá mudar para a vista de distribuição temporal e ver os seus eventos como num diagrama de Gantt.
-Comment[pt_BR]=Este plug-in fornece uma visão de período de tempo para o KOrganizer (como a visão de pendências e do mês). Se você ativar este plugin, você pode mudar para a visão de período de tempo e ver seus eventos como num diagrama de Gantt.
-Comment[ru]=Этот модуль показывает диаграмму Ганта для органайзера TDE. Если вы подключите этот модуль, вы можете посмотреть ваши события в виде диаграммы Ганта.
-Comment[sk]=Tento modul poskytuje projektový pohľad pre korganizer (ako sú úlohy alebo mesačné pohľady). Ak povolíte tento modul, môžete prepínať projektový pohľad a pohľad na udalosti ako je Gantt diagram.
-Comment[sl]=Ta vstavek ponuja časovni prikaz za KOrganizer (kot prikaz opravil ali mesečni prikaz). Če omogočite ta vstavek, lahko preklopite na časovni prikaz in si ogledate dogodke kot v Ganttovem diagramu.
-Comment[sr]=Овај прикључак пружа приказ временског распона за KOrganizer (као месечни или прикази обавеза). Ако укључите овај прикључак, можете се пребацити на приказ временског распона и разгледати своје догађаје као у Гантовом дијаграму.
-Comment[sr@Latn]=Ovaj priključak pruža prikaz vremenskog raspona za KOrganizer (kao mesečni ili prikazi obaveza). Ako uključite ovaj priključak, možete se prebaciti na prikaz vremenskog raspona i razgledati svoje događaje kao u Gantovom dijagramu.
-Comment[sv]=Insticksprogrammet tillhandahåller en tidsintervallvy i Korganizer (som liknar uppgifts- eller månadsvyn). Om du aktiverar insticksprogrammet kan du byta till idsintervallvyn och visa dina händelser som i ett Gantt-diagram.
-Comment[ta]=இந்த சொருகுப்பொருள் korganizerக்கான ஒரு குறுகிய நேரத்தை வழங்குகிறது. lசெய்யவேண்டியவை அல்ல்து மாதக் காட்சிகள் போன்ற). இந்த சொருகுப்பொருள் செயலில் இருந்தால், நீங்கள் குறுகிய நேரக் காட்சி மற்ரும் Gantt விளக்க வரைபடத்தில் உள்ளது போன்ற நிகழ்வுகளை பார்க்கலாம்.
-Comment[tr]=Bu eklenti, KOrganizer için zaman dilimi görünümü sağlar (yapılacaklar listesi ya da aylık görünüm gibi). Eğer bu eklentiyi aktif hale getirirseniz, zaman dilimi görünümüne geçebilir ve olayları Gantt diyagramı şeklinde görüntüleyebilirsiniz.
-Comment[uk]=Цей втулок показує вигляд діаграми Ганта для korganizer (подібно до вигляду завдань та місячного). Якщо увімкнути цей втулок, то можна переглядати ваші події у вигляді діаграми Ганта.
-Comment[zh_CN]=此插件为 KOrganizer 提供了时间跨度视图(类似于待办或月视图)。如果您启用了此插件,您可以像甘特图程序那样切换到时间跨度视图并查看您的事件。
-Comment[zh_TW]=此外掛程式提供時間檢視模式。如果您開啟此外掛程式,您可以切換時間檢視,讓您使用類似甘特圖的圖形來檢視事件。
+
Type=Service
X-TDE-ServiceTypes=KOrganizer/Part
X-TDE-KOrganizer-HasSettings=false
diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h
index ee20bb13..dab3ac48 100644
--- a/korganizer/plugins/timespanview/timespanview.h
+++ b/korganizer/plugins/timespanview/timespanview.h
@@ -24,7 +24,7 @@
#include <korganizer/calendarviewbase.h>
class TimespanView : public KOrg::Part {
- Q_OBJECT
+ TQ_OBJECT
public:
TimespanView(KOrg::MainWindow *, const char *);
diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index 8b0ff4b3..99f529b3 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -63,19 +63,19 @@ TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) :
TQBoxLayout *buttonLayout = new TQHBoxLayout( rightPaneLayout );
TQPushButton *zoomInButton = new TQPushButton( i18n("Zoom In"), rightPane );
- connect( zoomInButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomIn() ) );
+ connect( zoomInButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomIn() ) );
buttonLayout->addWidget( zoomInButton );
TQPushButton *zoomOutButton = new TQPushButton( i18n("Zoom Out"), rightPane );
- connect( zoomOutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomOut() ) );
+ connect( zoomOutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomOut() ) );
buttonLayout->addWidget( zoomOutButton );
TQPushButton *centerButton = new TQPushButton( i18n("Center View"), rightPane );
- connect( centerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( centerView() ) );
+ connect( centerButton, TQ_SIGNAL( clicked() ), TQ_SLOT( centerView() ) );
buttonLayout->addWidget( centerButton );
- connect(mLineView->horizontalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- mTimeLine,TQT_SLOT(setContentsPos(int)));
+ connect(mLineView->horizontalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ mTimeLine,TQ_SLOT(setContentsPos(int)));
}
TimeSpanWidget::~TimeSpanWidget()
diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h
index cf2991df..187786ad 100644
--- a/korganizer/plugins/timespanview/timespanwidget.h
+++ b/korganizer/plugins/timespanview/timespanwidget.h
@@ -37,7 +37,7 @@ class TimeLine;
class TimeSpanWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeSpanWidget( TQWidget *parent=0, const char *name=0 );
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index dade7791..8e77504a 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -64,8 +64,8 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent )
topLayout->setSpacing( spacingHint() );
topLayout->setMargin( marginHint() );
- connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotMerge()) );
- connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotAdd()) );
+ connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotMerge()) );
+ connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotAdd()) );
// when someone edits a kmail attachment he's editing a tmp file, check for that
// and if it's a tmp file then open a save dialog
diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h
index 243be11d..73540d47 100644
--- a/korganizer/previewdialog.h
+++ b/korganizer/previewdialog.h
@@ -40,7 +40,7 @@ namespace KCal {
class PreviewDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PreviewDialog( const KURL &url, TQWidget *parent );
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index b9c070eb..a13bc130 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -248,10 +248,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 65d1bc08..8a9a6cb2 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
TQVBox *page = makeVBoxMainWidget();
TQSplitter *splitter = new TQSplitter( page );
- splitter->setOrientation( Qt::Horizontal );
+ splitter->setOrientation( TQt::Horizontal );
mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
// use the minimal width possible = max width of the radio buttons, not extensible
@@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
splitterRightLayout->addWidget( mOrientationSelection, 1, 1 );
// signals and slots connections
- connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) );
+ connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) );
orientationLabel->setBuddy( mOrientationSelection );
// First insert the config widgets into the widget stack. This possibly assigns
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index 29b925a6..5d5035f4 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -31,7 +31,7 @@
#include <kdialogbase.h>
#include <korganizer/baseview.h>
#include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
namespace KOrg {
class CoreHelper;
@@ -52,7 +52,7 @@ class TQLabel;
*/
class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -106,7 +106,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
class CalPrintDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
CalPrintDialog( KOrg::PrintPlugin::List plugins,
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 9eecda39..c094ad84 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -38,7 +38,7 @@
#ifndef KORG_NOPRINTER
-inline int round(const double x)
+inline int roundToInt(const double x)
{
return int(x > 0.0 ? x + 0.5 : x - 0.5);
}
@@ -1178,7 +1178,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
// Fill the remaining space (if a month has less days than others) with a crossed-out pattern
if ( daysinmonth<maxdays ) {
- TQRect dayBox( box.left(), daysBox.top() + round(dayheight*daysinmonth), box.width(), 0 );
+ TQRect dayBox( box.left(), daysBox.top() + roundToInt(dayheight*daysinmonth), box.width(), 0 );
dayBox.setBottom( daysBox.bottom() );
p.fillRect( dayBox, TQt::DiagCrossPattern );
}
@@ -1187,9 +1187,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
for ( d = 0; d < daysinmonth; ++d ) {
TQDate day;
calsys->setYMD( day, dt.year(), dt.month(), d+1 );
- TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + round(dayheight*d), daysBox.width()/*-rand()%50*/, 0 );
+ TQRect dayBox( daysBox.left()/*+rand()%50*/, daysBox.top() + roundToInt(dayheight*d), daysBox.width()/*-rand()%50*/, 0 );
// FIXME: When using a border width of 0 for event boxes, don't let the rectangles overlap, i.e. subtract 1 from the top or bottom!
- dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) - 1 );
+ dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) - 1 );
p.setBrush( isWorkingDay( day )?workdayColor:holidayColor );
p.drawRect( dayBox );
@@ -1314,9 +1314,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
int minsToEnd = starttime.secsTo( placeItem->end() )/60;
TQRect eventBox( xstartcont + placeItem->subCell()*17,
- daysBox.top() + round( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ),
+ daysBox.top() + roundToInt( double( minsToStart*daysBox.height()) / double(maxdays*24*60) ),
14, 0 );
- eventBox.setBottom( daysBox.top() + round( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) );
+ eventBox.setBottom( daysBox.top() + roundToInt( double( minsToEnd*daysBox.height()) / double(maxdays*24*60) ) );
drawVerticalBox( p, 0, eventBox, placeItem->event()->summary() );
newxstartcont = TQMAX( newxstartcont, eventBox.right() );
}
@@ -1327,9 +1327,9 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect
for ( int d=0; d<daysinmonth; ++d ) {
TQStringList dayEvents( textEvents[d+1] );
TQString txt = dayEvents.join(", ");
- TQRect dayBox( xstartcont, daysBox.top()+round(dayheight*d), 0, 0 );
+ TQRect dayBox( xstartcont, daysBox.top()+roundToInt(dayheight*d), 0, 0 );
dayBox.setRight( box.right() );
- dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) );
+ dayBox.setBottom( daysBox.top()+roundToInt(dayheight*(d+1)) );
printEventString(p, dayBox, txt, TQt::AlignTop | TQt::AlignLeft | TQt::BreakAnywhere );
}
p.setFont( oldfont );
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 3684e2f1..7b9e52e0 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
#include <tqdatetime.h>
#include <kprinter.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <libkcal/calendar.h>
#include <libkcal/event.h>
#include <libkcal/todo.h>
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index 106ffd7d..031c45dd 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -245,9 +245,6 @@
<property name="text">
<string>Due date</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -446,10 +443,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/calprintweetdeconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui
index 0be844ab..079bd164 100644
--- a/korganizer/printing/calprintweetdeconfig_base.ui
+++ b/korganizer/printing/calprintweetdeconfig_base.ui
@@ -291,10 +291,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kdateedit.h</include>
+ <include location="global" impldecl="in implementation">libtdepim/kdateedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>libtdepim/kdateedit.h</includehint>
- <includehint>libtdepim/kdateedit.h</includehint>
-</includehints>
</UI>
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index e4a37da0..4d8206bc 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
namespace KOrg {
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index c8366add..5e597524 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -46,18 +46,18 @@ PublishDialog::PublishDialog( TQWidget* parent, const char* name,
setMainWidget( mWidget );
mWidget->mNameLineEdit->setEnabled( false );
mWidget->mEmailLineEdit->setEnabled( false );
- connect( mWidget->mAddressListView, TQT_SIGNAL( selectionChanged(TQListViewItem *) ),
- TQT_SLOT(updateInput()));
- connect( mWidget->mNew, TQT_SIGNAL( clicked() ),
- TQT_SLOT( addItem() ) );
- connect( mWidget->mRemove, TQT_SIGNAL( clicked() ),
- TQT_SLOT( removeItem() ) );
- connect( mWidget->mSelectAddressee, TQT_SIGNAL( clicked() ),
- TQT_SLOT( openAddressbook() ) );
- connect( mWidget->mNameLineEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( updateItem() ) );
- connect( mWidget->mEmailLineEdit, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( updateItem() ) );
+ connect( mWidget->mAddressListView, TQ_SIGNAL( selectionChanged(TQListViewItem *) ),
+ TQ_SLOT(updateInput()));
+ connect( mWidget->mNew, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( addItem() ) );
+ connect( mWidget->mRemove, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( removeItem() ) );
+ connect( mWidget->mSelectAddressee, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( openAddressbook() ) );
+ connect( mWidget->mNameLineEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( updateItem() ) );
+ connect( mWidget->mEmailLineEdit, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( updateItem() ) );
}
PublishDialog::~PublishDialog()
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index dd1b5372..e4ede200 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -33,7 +33,7 @@ class PublishDialog_base;
class PublishDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
PublishDialog(TQWidget* parent=0,const char* name=0,
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index ea640bb9..d8d1b637 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent )
{
mResourceView = new ResourceView( mCalendar, mCalendarView, parent );
- TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
- mCalendarView, TQT_SLOT( resourcesChanged() ) );
- TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
+ TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+ mCalendarView, TQ_SLOT( resourcesChanged() ) );
+ TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
TQObject::connect( mCalendar,
- TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+ TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
mResourceView,
- TQT_SLOT( addResourceItem( ResourceCalendar * ) ) );
+ TQ_SLOT( addResourceItem( ResourceCalendar * ) ) );
TQObject::connect( mCalendar,
- TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+ TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
mResourceView,
- TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) );
- TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
- TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
- mCalendarView, TQT_SLOT( updateCategories() ) );
+ TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) );
+ TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
+ TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+ mCalendarView, TQ_SLOT( updateCategories() ) );
return mResourceView;
}
@@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar,
mListView->setResizeMode( TQListView::LastColumn );
topLayout->addWidget( mListView );
- connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
- TQT_SLOT( currentChanged( TQListViewItem * ) ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) );
- connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
+ connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+ TQ_SLOT( currentChanged( TQListViewItem * ) ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) );
+ connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
int ) ),
- TQT_SLOT( editResource() ) );
- connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *,
+ TQ_SLOT( editResource() ) );
+ connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *,
const TQPoint &, int ) ),
- TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
+ TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
int ) ) );
updateView();
@@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource )
item->update();
}
- connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
const TQString &,
const TQString &,
const TQString & ) ),
- TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
+ TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
const TQString &, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
const TQString &,
const TQString & ) ),
- TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
+ TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
const TQString & ) ) );
- connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ),
- TQT_SLOT( closeResource( ResourceCalendar * ) ) );
+ connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ),
+ TQ_SLOT( closeResource( ResourceCalendar * ) ) );
updateResourceList();
emit resourcesChanged();
@@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
ResourceItem *item = static_cast<ResourceItem *>( lvitem );
TQPopupMenu *menu = new TQPopupMenu( this );
- connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
+ connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) );
if ( item ) {
int reloadId = menu->insertItem( i18n("Re&load"), this,
- TQT_SLOT( reloadResource() ) );
+ TQ_SLOT( reloadResource() ) );
menu->setItemEnabled( reloadId, item->resource()->isActive() );
int saveId = menu->insertItem( i18n("&Save"), this,
- TQT_SLOT( saveResource() ) );
+ TQ_SLOT( saveResource() ) );
menu->setItemEnabled( saveId, item->resource()->isActive() );
menu->insertSeparator();
- menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) );
+ menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) );
//FIXME: This is better on the resource dialog
if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) {
TQPopupMenu *assignMenu= new TQPopupMenu( menu );
- assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) );
+ assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) );
if ( item->resourceColor().isValid() )
- assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) );
+ assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) );
menu->insertItem( i18n( "Resources Colors" ), assignMenu );
}
if ( item->isSubresource() &&
( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
- menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
+ menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) );
}
} else {
- menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) );
+ menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) );
}
- menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) );
+ menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) );
if ( item->resource() != manager->standardResource() ) {
menu->insertSeparator();
menu->insertItem( i18n("Use as &Default Calendar"), this,
- TQT_SLOT( setStandard() ) );
+ TQ_SLOT( setStandard() ) );
}
menu->insertSeparator();
}
- menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) );
+ menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) );
menu->popup( pos );
}
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index 1a073c2b..4c7ad289 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -94,7 +94,7 @@ class ResourceItem : public TQCheckListItem
*/
class ResourceView : public CalendarViewExtension
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceView( CalendarResources *calendar, CalendarView *view,
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index c9e5f886..4087a810 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -63,8 +63,8 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
subLayout->addWidget( searchLabel );
subLayout->addWidget( searchEdit );
searchEdit->setFocus();
- connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( searchTextChanged( const TQString & ) ) );
+ connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( searchTextChanged( const TQString & ) ) );
TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
@@ -76,7 +76,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
mTodosCheck->setChecked( true );
// Date range
- TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ),
+ TQGroupBox *rangeGroup = new TQGroupBox( 1, TQt::Horizontal, i18n( "Date Range" ),
topFrame );
layout->addWidget( rangeGroup );
@@ -117,15 +117,15 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
KOGlobals::fitDialogToScreen( this, true );
}
- connect( this,TQT_SIGNAL(user1Clicked()),TQT_SLOT(doSearch()));
+ connect( this,TQ_SIGNAL(user1Clicked()),TQ_SLOT(doSearch()));
// Propagate edit and delete event signals from event list view
- connect( listView, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
- connect( listView, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
- connect( listView, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( listView, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( listView, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( listView, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) );
}
SearchDialog::~SearchDialog()
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index c1beef80..5cb22dc7 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -45,7 +45,7 @@ using namespace KCal;
class SearchDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SearchDialog(Calendar *calendar,TQWidget *parent=0);
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 1d406447..d46f018c 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -56,11 +56,11 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
TQPushButton *ok = new KPushButton(KStdGuiItem::ok(), this);
- connect ( ok,TQT_SIGNAL(clicked()), this,TQT_SLOT(accept()) );
+ connect ( ok,TQ_SIGNAL(clicked()), this,TQ_SLOT(accept()) );
buttonLayout->addWidget( ok );
TQPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), this);
- connect ( cancel,TQT_SIGNAL(clicked()), this,TQT_SLOT(reject()) );
+ connect ( cancel,TQ_SIGNAL(clicked()), this,TQ_SLOT(reject()) );
buttonLayout->addWidget( cancel );
}
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index 4aa00d3e..144b7d87 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -28,7 +28,7 @@ class TQComboBox;
class StatusDialog : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
StatusDialog(TQWidget* parent=0,const char* name=0);
diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp
index 57209cd0..3d673c37 100644
--- a/korganizer/templatemanagementdialog.cpp
+++ b/korganizer/templatemanagementdialog.cpp
@@ -52,15 +52,15 @@ TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStr
{
m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" );
setMainWidget( m_base );
- connect( m_base->m_buttonAdd, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotAddTemplate() ) );
- connect( m_base->m_buttonDelete, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotDeleteTemplate() ) );
+ connect( m_base->m_buttonAdd, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotAddTemplate() ) );
+ connect( m_base->m_buttonDelete, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotDeleteTemplate() ) );
m_base->m_listBox->insertStringList( m_templates );
- connect( m_base->m_listBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ),
- TQT_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) );
- connect( m_base->m_buttonApply, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotApplyTemplate() ) );
+ connect( m_base->m_listBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ),
+ TQ_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) );
+ connect( m_base->m_buttonApply, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotApplyTemplate() ) );
}
@@ -75,7 +75,7 @@ void TemplateManagementDialog::slotAddTemplate()
if ( m_templates.find( newTemplate) != m_templates.end() ) {
int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite"));
if ( rc == KMessageBox::Cancel ) {
- TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) );
+ TQTimer::singleShot(0, this, TQ_SLOT( slotAddTemplate() ) );
return;
}
duplicate = true;
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index d3e5995c..e22e41b2 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -45,7 +45,7 @@
#include <kdialogbase.h>
class TemplateManagementDialog: public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
public:
TemplateManagementDialog( TQWidget *parent, const TQStringList& templates );
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 27a253c0..19ae5721 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -230,10 +230,10 @@ void TimeLabels::setAgenda( KOAgenda* agenda )
{
mAgenda = agenda;
- connect(mAgenda, TQT_SIGNAL(mousePosSignal(const TQPoint &)), this, TQT_SLOT(mousePosChanged(const TQPoint &)));
- connect(mAgenda, TQT_SIGNAL(enterAgenda()), this, TQT_SLOT(showMousePos()));
- connect(mAgenda, TQT_SIGNAL(leaveAgenda()), this, TQT_SLOT(hideMousePos()));
- connect(mAgenda, TQT_SIGNAL(gridSpacingYChanged( double ) ), this, TQT_SLOT( setCellHeight( double ) ) );
+ connect(mAgenda, TQ_SIGNAL(mousePosSignal(const TQPoint &)), this, TQ_SLOT(mousePosChanged(const TQPoint &)));
+ connect(mAgenda, TQ_SIGNAL(enterAgenda()), this, TQ_SLOT(showMousePos()));
+ connect(mAgenda, TQ_SIGNAL(leaveAgenda()), this, TQ_SLOT(hideMousePos()));
+ connect(mAgenda, TQ_SIGNAL(gridSpacingYChanged( double ) ), this, TQ_SLOT( setCellHeight( double ) ) );
}
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 8153742f..77d565b4 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -38,7 +38,7 @@ class TDEConfig;
class TimeLabels : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0,
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index 572a67a5..ccf8338f 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -24,7 +24,7 @@
#ifndef URIHANDLER_H
#define URIHANDLER_H
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class TQString;
class TQWidget;