diff options
Diffstat (limited to 'karm')
| -rw-r--r-- | karm/TODO | 2 | ||||
| -rw-r--r-- | karm/csvexportdialog_base.ui | 4 | ||||
| -rw-r--r-- | karm/desktoptracker.cpp | 6 | ||||
| -rw-r--r-- | karm/doc/Mainpage.dox | 10 | ||||
| -rw-r--r-- | karm/edittaskdialog.cpp | 6 | ||||
| -rw-r--r-- | karm/idletimedetector.cpp | 2 | ||||
| -rw-r--r-- | karm/karm.tdevelop | 142 | ||||
| -rw-r--r-- | karm/karm_part.cpp | 132 | ||||
| -rw-r--r-- | karm/karmstorage.cpp | 16 | ||||
| -rw-r--r-- | karm/karmstorage.h | 2 | ||||
| -rw-r--r-- | karm/ktimewidget.cpp | 2 | ||||
| -rw-r--r-- | karm/main.cpp | 4 | ||||
| -rw-r--r-- | karm/mainwindow.cpp | 132 | ||||
| -rw-r--r-- | karm/preferences.cpp | 14 | ||||
| -rw-r--r-- | karm/task.cpp | 26 | ||||
| -rw-r--r-- | karm/taskview.cpp | 54 | ||||
| -rw-r--r-- | karm/tdeaccelmenuwatch.cpp | 2 | ||||
| -rw-r--r-- | karm/test/script.cpp | 16 | ||||
| -rw-r--r-- | karm/tray.cpp | 4 |
19 files changed, 217 insertions, 359 deletions
@@ -1,6 +1,6 @@ * KarmWindow::makeMenus -> export TDEAction? KarmWindow::contextMenuRequest * QPopupMenu should be static! put connect( ..contextMenu at the right place -* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action +* mainwindow: move tray signals into tray.cpp add mouse double-click action * (start new timer, stop old) to "Configure Shortcuts" dialog. diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 361ff510..091262c3 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -402,9 +402,9 @@ <tabstop>btnExport</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>enableExportButton()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdateedit.h</include> diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp index 06216570..cf41d5b3 100644 --- a/karm/desktoptracker.cpp +++ b/karm/desktoptracker.cpp @@ -11,8 +11,8 @@ const int minimumInterval = 5; // seconds DesktopTracker::DesktopTracker () { // Setup desktop change handling - connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ), - this, TQT_SLOT( handleDesktopChange(int) )); + connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ), + this, TQ_SLOT( handleDesktopChange(int) )); _desktopCount = kWinModule.numberOfDesktops(); _previousDesktop = kWinModule.currentDesktop()-1; @@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker () if( _previousDesktop < 0 ) _previousDesktop = 0; _timer = new TQTimer(this); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) ); } void DesktopTracker::handleDesktopChange( int desktop ) diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox index b320effb..b1228f32 100644 --- a/karm/doc/Mainpage.dox +++ b/karm/doc/Mainpage.dox @@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same information. Preferences is a singleton that stores configuration options. It raises -Q_SIGNALS when options change (for example, the location where the karm data is +signals when options change (for example, the location where the karm data is stored) so the application can react and adjust. KarmStorage is a singleton that creates an interface for storing KArm data. @@ -35,7 +35,7 @@ format. /** \page sig_slot_index Index of Signals and Slots -To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and +To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and connections. See \see connections to get an index of what signal is connected to which slot. \section overview Summary of what each class provides @@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to <tr><td>Task</td> <td> </td> <td> </td> <td>Y </td> <td> </td></tr> </table> -\section Q_SIGNALS Listing of all of the Q_SIGNALS +\section signals Listing of all of the signals -These are the Q_SIGNALS: +These are the signals: <ol> <li>IdleTimer::extractTime(int) <li>IdleTimer::stopTimer() @@ -83,7 +83,7 @@ These are the Q_SIGNALS: <li>Preferences::hideOnClose(bool) </ol> -\section Q_SLOTS Listing of the Q_SLOTS +\section slots Listing of the slots \subsection public Public Slots diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index d63a339a..37d215d5 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page, "_absoluteRB" ); lay1->addWidget( _absoluteRB ); - connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) ); + connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) ); // Absolute times @@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and" " session time)" ), page, "_relativeRB" ); lay1->addWidget( _relativeRB ); - connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) ); + connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) ); // The relative times TQHBoxLayout *lay4 = new TQHBoxLayout(); @@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, for (int i=0; i<desktopCount; i++) _deskBox[i]->setEnabled(enableDesktops); - connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed())); + connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed())); lay1->addStretch(1); diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 110eacd0..bf4092f5 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle) } _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check())); #else _idleDetectionPossible = false; #endif // HAVE_LIBXSS diff --git a/karm/karm.tdevelop b/karm/karm.tdevelop deleted file mode 100644 index 963fa7c4..00000000 --- a/karm/karm.tdevelop +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>root</author> - <email>root@duffman</email> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <run> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <mainprogram>karm</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - </kdevautoproject> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <references/> - </kdevcppsupport> -</tdevelop> diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 157222d2..1adb45df 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -8,7 +8,7 @@ #include "version.h" #include <tdeaccel.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), _accel ( new TDEAccel( parentWidget ) ), - _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) + _watcher ( new TDEAccelMenuWatch( _accel, parentWidget ) ) { // we need an instance setInstance( karmPartFactory::instance() ); @@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, setWidget(_taskView); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); makeMenus(); @@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -113,119 +113,119 @@ void karmPart::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); - actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), - TQT_SLOT(showDialog()), + actionPreferences = KStdAction::preferences(_preferences, + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( startNewSession() ), + this, + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( resetAllTimes() ), + this, + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( startCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), 0, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopAllTimers() ), actionCollection(), + _taskView, + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newTask() ), actionCollection(), + _taskView, + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newSubTask() ), actionCollection(), + _taskView, + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, - TQT_TQOBJECT(_taskView), - TQT_SLOT( deleteTask() ), actionCollection(), + _taskView, + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, - TQT_TQOBJECT(_taskView), - TQT_SLOT( editTask() ), actionCollection(), + _taskView, + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, -// TQT_TQOBJECT(_taskView), -// TQT_SLOT( addCommentToTask() ), +// _taskView, +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsComplete() ), + _taskView, + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsIncomplete() ), + _taskView, + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipTotals() ), + _taskView, + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipHistory() ), + _taskView, + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); new TDEAction( i18n("Configure KArm..."), 0, - TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(), + _preferences, TQ_SLOT(showDialog()), actionCollection(), "configure_karm"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ @@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw) { // notify your internal widget of the read-write state if (rw) - connect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); @@ -414,7 +414,7 @@ TDEInstance* karmPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkarmpart() + TDE_EXPORT void* init_libkarmpart() { TDEGlobal::locale()->insertCatalogue("karm"); return new karmPartFactory; @@ -473,7 +473,7 @@ TQString karmPart::taskIdFromName( const TQString &taskname ) const void karmPart::quit() { - // TODO: write something for kapp->quit(); + // TODO: write something for tdeApp->quit(); } bool karmPart::save() diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1992c0f8..84ac8930 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include "incidence.h" -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include <kdebug.h> #include <tdeemailsettings.h> #include <tdelocale.h> // i18n @@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt } _calendar = resource; - TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)), - view, TQT_SLOT(iCalFileModified(ResourceCalendar *))); + TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)), + view, TQ_SLOT(iCalFileModified(ResourceCalendar *))); _calendar->setTimeZoneId( KPimPrefs::timezone() ); _calendar->setResourceName( TQString::fromLatin1("KArm") ); _calendar->open(); @@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, while ( tasknr < taskview->count() && !dialog.wasCancelled() ) { dialog.progressBar()->advance( 1 ); - if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow + if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // repainting is slow if ( taskview->item_at_index(tasknr)->depth() > maxdepth ) maxdepth = taskview->item_at_index(tasknr)->depth(); tasknr++; @@ -620,7 +620,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview, { task = taskview->item_at_index( tasknr ); dialog.progressBar()->advance( 1 ); - if ( tasknr % 15 == 0 ) kapp->processEvents(); + if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // indent the task in the csv-file: for ( int i=0; i < task->depth(); ++i ) retval += delim; @@ -1069,7 +1069,7 @@ bool KarmStorage::bookTime(const Task* task, e->setDtEnd( startDateTime.addSecs( durationInSeconds ) ); // Use a custom property to keep a record of negative durations - e->setCustomProperty( kapp->instanceName(), + e->setCustomProperty( tdeApp->instanceName(), TQCString("duration"), TQString::number(durationInSeconds)); @@ -1095,7 +1095,7 @@ void KarmStorage::changeTime(const Task* task, const long deltaSeconds) e->setDtEnd(end); // Use a custom property to keep a record of negative durations - e->setCustomProperty( kapp->instanceName(), + e->setCustomProperty( tdeApp->instanceName(), TQCString("duration"), TQString::number(deltaSeconds)); @@ -1175,7 +1175,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from, // an easy fix for a (hopefully) rare situation. processed.append( (*event)->uid()); - duration = (*event)->customProperty(kapp->instanceName(), + duration = (*event)->customProperty(tdeApp->instanceName(), TQCString("duration")); if ( ! duration.isNull() ) { diff --git a/karm/karmstorage.h b/karm/karmstorage.h index 4087d3da..e411f09d 100644 --- a/karm/karmstorage.h +++ b/karm/karmstorage.h @@ -34,7 +34,7 @@ #include <calendarresources.h> #include <vector> #include "resourcecalendar.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQDateTime; class Preferences; diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index fb18e8be..ecf632a7 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -17,7 +17,7 @@ class TimeValidator : public TQValidator { public: TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { _tp = tp; } diff --git a/karm/main.cpp b/karm/main.cpp index ef4326dc..cdc43e9d 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -15,7 +15,7 @@ namespace void cleanup( int ) { kdDebug(5970) << i18n("Just caught a software interrupt.") << endl; - kapp->exit(); + tdeApp->exit(); } } @@ -79,7 +79,7 @@ int main( int argc, char *argv[] ) myApp.setMainWidget( mainWindow ); - if (kapp->isRestored() && TDEMainWindow::canBeRestored( 1 )) + if (tdeApp->isRestored() && TDEMainWindow::canBeRestored( 1 )) mainWindow->restore( 1, false ); else mainWindow->show(); diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 8265db05..26cab9b5 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -9,7 +9,7 @@ #include <dcopclient.h> #include <tdeaccel.h> #include <tdeaction.h> -#include <tdeapplication.h> // kapp +#include <tdeapplication.h> // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> @@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile ) : DCOPObject ( "KarmDCOPIface" ), KParts::MainWindow(0,TQt::WStyle_ContextHelp), _accel ( new TDEAccel( this ) ), - _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ), + _watcher ( new TDEAccelMenuWatch( _accel, this ) ), _totalSum ( 0 ), _sessionSum( 0 ) { @@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile ) _watcher->updateMenus(); // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ), - this, TQT_SLOT(setStatusBar( TQString ))); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ), + this, TQ_SLOT(setStatusBar( TQString ))); loadGeometry(); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -93,10 +93,10 @@ MainWindow::MainWindow( const TQString &icsfile ) slotSelectionChanged(); // Register with DCOP - if ( !kapp->dcopClient()->isRegistered() ) + if ( !tdeApp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "karm" ); - kapp->dcopClient()->setDefaultObject( objId() ); + tdeApp->dcopClient()->registerAs( "karm" ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } // Set up DCOP error messages @@ -161,7 +161,7 @@ void MainWindow::exportcsvHistory() void MainWindow::quit() { - kapp->quit(); + tdeApp->quit(); } @@ -251,124 +251,124 @@ void MainWindow::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); - actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), - TQT_SLOT(showDialog()), + actionPreferences = KStdAction::preferences(_preferences, + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( startNewSession() ), + this, + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( resetAllTimes() ), + this, + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( startCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), Key_S, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + _taskView, + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, - TQT_TQOBJECT(_taskView), - TQT_SLOT( stopAllTimers() ), actionCollection(), + _taskView, + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newTask() ), actionCollection(), + _taskView, + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, - TQT_TQOBJECT(_taskView), - TQT_SLOT( newSubTask() ), actionCollection(), + _taskView, + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, - TQT_TQOBJECT(_taskView), - TQT_SLOT( deleteTask() ), actionCollection(), + _taskView, + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, - TQT_TQOBJECT(_taskView), - TQT_SLOT( editTask() ), actionCollection(), + _taskView, + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, -// TQT_TQOBJECT(_taskView), -// TQT_SLOT( addCommentToTask() ), +// _taskView, +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsComplete() ), + _taskView, + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, - TQT_TQOBJECT(_taskView), - TQT_SLOT( markTaskAsIncomplete() ), + _taskView, + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipTotals() ), + _taskView, + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); // actionClipTotals will never be used again, overwrite it actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"), TQString::fromLatin1("klipper"), 0, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipSession() ), + _taskView, + TQ_SLOT( clipSession() ), actionCollection(), "clip_session"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, - TQT_TQOBJECT(_taskView), - TQT_SLOT( clipHistory() ), + _taskView, + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ @@ -440,7 +440,7 @@ void MainWindow::loadGeometry() if (initialGeometrySet()) setAutoSaveSettings(); else { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( TQString::fromLatin1("Main Window Geometry") ); int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 ); @@ -463,7 +463,7 @@ void MainWindow::saveGeometry() bool MainWindow::queryClose() { - if ( !kapp->sessionSaving() ) { + if ( !tdeApp->sessionSaving() ) { hide(); return false; } diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 29b242cf..3c04ee8f 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -5,14 +5,14 @@ #include <tqspinbox.h> #include <tqlayout.h> -#include <tdeapplication.h> // kapp +#include <tdeapplication.h> // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdeemailsettings.h> #include <kiconloader.h> #include <klineedit.h> // lineEdit() #include <tdelocale.h> // i18n -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "preferences.h" @@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage() topLevel->addStretch(); - connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( idleDetectCheckBoxChanged() )); + connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( idleDetectCheckBoxChanged() )); } void Preferences::makeDisplayPage() @@ -138,8 +138,8 @@ void Preferences::makeStoragePage() topLevel->addStretch(); // checkboxes disable file selection controls - connect( _doAutoSaveW, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( autoSaveCheckBoxChanged() )); + connect( _doAutoSaveW, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( autoSaveCheckBoxChanged() )); } void Preferences::disableIdleDetection() @@ -252,7 +252,7 @@ TQString Preferences::userRealName() const { return _userRealNa //--------------------------------------------------------------------------- void Preferences::load() { - TDEConfig &config = *kapp->config(); + TDEConfig &config = *tdeApp->config(); config.setGroup( TQString::fromLatin1("Idle detection") ); _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"), diff --git a/karm/task.cpp b/karm/task.cpp index 5b05407d..6b4d3283 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -5,7 +5,7 @@ #include <kiconloader.h> -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include "kdebug.h" #include "event.h" @@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, // If our parent is the taskview then connect our totalTimesChanged // signal to its receiver if ( ! parent() ) - connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ), - listView(), TQT_SLOT( taskTotalTimesChanged( long, long) )); + connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ), + listView(), TQ_SLOT( taskTotalTimesChanged( long, long) )); - connect( this, TQT_SIGNAL( deletingTask( Task* ) ), - listView(), TQT_SLOT( deletingTask( Task* ) )); + connect( this, TQ_SIGNAL( deletingTask( Task* ) ), + listView(), TQ_SLOT( deletingTask( Task* ) )); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); @@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, _totalSessionTime = _sessionTime = sessionTime; _timer = new TQTimer(this); _desktops = desktops; - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon())); setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); _currentPic = 0; _percentcomplete = percent_complete; @@ -306,15 +306,15 @@ KCal::Todo* Task::asTodo(KCal::Todo* todo) const // time the file is opened. // todo->setDtStart( current ); - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "totalTaskTime" ), TQString::number( _time ) ); - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "totalSessionTime" ), TQString::number( _sessionTime) ); if (getDesktopStr().isEmpty()) - todo->removeCustomProperty(kapp->instanceName(), TQCString("desktopList")); + todo->removeCustomProperty(tdeApp->instanceName(), TQCString("desktopList")); else - todo->setCustomProperty( kapp->instanceName(), + todo->setCustomProperty( tdeApp->instanceName(), TQCString( "desktopList" ), getDesktopStr() ); todo->setOrganizer( Preferences::instance()->userRealName() ); @@ -336,18 +336,18 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes, _comment = incident->description(); ok = false; - minutes = incident->customProperty( kapp->instanceName(), + minutes = incident->customProperty( tdeApp->instanceName(), TQCString( "totalTaskTime" )).toInt( &ok ); if ( !ok ) minutes = 0; ok = false; - sessionMinutes = incident->customProperty( kapp->instanceName(), + sessionMinutes = incident->customProperty( tdeApp->instanceName(), TQCString( "totalSessionTime" )).toInt( &ok ); if ( !ok ) sessionMinutes = 0; - TQString desktopList = incident->customProperty( kapp->instanceName(), + TQString desktopList = incident->customProperty( tdeApp->instanceName(), TQCString( "desktopList" ) ); TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","), desktopList ); diff --git a/karm/taskview.cpp b/karm/taskview.cpp index d1b80bf8..6fb09c38 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -10,7 +10,7 @@ #include <tqtimer.h> #include <tqxml.h> -#include "tdeapplication.h" // kapp +#include "tdeapplication.h" // tdeApp #include <tdeconfig.h> #include <kdebug.h> #include <tdefiledialog.h> @@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) _preferences = Preferences::instance( icsfile ); _storage = KarmStorage::instance(); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); // setup default values previousColumnWidths[0] = previousColumnWidths[1] @@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) // set up the minuteTimer _minuteTimer = new TQTimer(this); - connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() )); + connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() )); _minuteTimer->start(1000 * secsPerMinute); // React when user changes iCalFile - connect(_preferences, TQT_SIGNAL(iCalFile(TQString)), - this, TQT_SLOT(iCalFileChanged(TQString))); + connect(_preferences, TQ_SIGNAL(iCalFile(TQString)), + this, TQ_SLOT(iCalFileChanged(TQString))); // resize columns when config is changed - connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() )); + connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() )); _minuteTimer->start(1000 * secsPerMinute); // Set up the idle detection. _idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() ); - connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ), - this, TQT_SLOT( extractTime(int) )); - connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ), - this, TQT_SLOT( stopAllTimersAt(TQDateTime) )); - connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ), - _idleTimeDetector, TQT_SLOT( setMaxIdle(int) )); - connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ), - _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) )); + connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ), + this, TQ_SLOT( extractTime(int) )); + connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ), + this, TQ_SLOT( stopAllTimersAt(TQDateTime) )); + connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ), + _idleTimeDetector, TQ_SLOT( setMaxIdle(int) )); + connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ), + _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) )); if (!_idleTimeDetector->isIdleDetectionPossible()) _preferences->disableIdleDetection(); // Setup auto save timer _autoSaveTimer = new TQTimer(this); - connect( _preferences, TQT_SIGNAL( autoSave(bool) ), - this, TQT_SLOT( autoSaveChanged(bool) )); - connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ), - this, TQT_SLOT( autoSavePeriodChanged(int) )); - connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _preferences, TQ_SIGNAL( autoSave(bool) ), + this, TQ_SLOT( autoSaveChanged(bool) )); + connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ), + this, TQ_SLOT( autoSavePeriodChanged(int) )); + connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Setup manual save timer (to save changes a little while after they happen) _manualSaveTimer = new TQTimer(this); - connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Connect desktop tracker events to task starting/stopping _desktopTracker = new DesktopTracker(); - connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ), - this, TQT_SLOT( startTimerFor(Task*) )); - connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ), - this, TQT_SLOT( stopTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ), + this, TQ_SLOT( startTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ), + this, TQ_SLOT( stopTimerFor(Task*) )); new TaskViewWhatsThis( this ); } diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp index 5cb22366..3cc72ea8 100644 --- a/karm/tdeaccelmenuwatch.cpp +++ b/karm/tdeaccelmenuwatch.cpp @@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu ) if ( !_menuList.findRef( menu ) ) { _menuList.append( menu ); - connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) ); + connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) ); } _menu = menu; diff --git a/karm/test/script.cpp b/karm/test/script.cpp index f9fa9d9e..ab6f7579 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory ) m_proc = new TQProcess( this ); m_proc->setWorkingDirectory( workingDirectory ); - connect ( m_proc, TQT_SIGNAL( readyReadStdout() ), - this , TQT_SLOT ( stdout() ) + connect ( m_proc, TQ_SIGNAL( readyReadStdout() ), + this , TQ_SLOT ( stdout() ) ); - connect ( m_proc, TQT_SIGNAL( readyReadStderr() ), - this , TQT_SLOT ( stderr() ) + connect ( m_proc, TQ_SIGNAL( readyReadStderr() ), + this , TQ_SLOT ( stderr() ) ); - connect ( m_proc, TQT_SIGNAL( processExited() ), - this , TQT_SLOT ( exit() ) + connect ( m_proc, TQ_SIGNAL( processExited() ), + this , TQ_SLOT ( exit() ) ); } @@ -79,7 +79,7 @@ int Script::run() { m_proc->start(); // This didn't work. But Ctrl-C does. :P - //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) ); + //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) ); //while ( ! m_proc->normalExit() ); while ( m_proc->isRunning() ); return m_status; @@ -89,7 +89,7 @@ void Script::terminate() { // These both trigger processExited, so exit() will run. m_proc->tryTerminate(); - TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) ); + TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) ); } void Script::exit() diff --git a/karm/tray.cpp b/karm/tray.cpp index 5187c7e4..9332d1e0 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent) { // the timer that updates the "running" icon in the tray _taskActiveTimer = new TQTimer(this); - connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this, - TQT_SLOT( advanceClock()) ); + connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this, + TQ_SLOT( advanceClock()) ); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); |