[rkward-cvs] SF.net SVN: rkward: [1045] trunk/rkward/rkward/windows
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Tue Jan 2 13:24:57 UTC 2007
Revision: 1045
http://svn.sourceforge.net/rkward/?rev=1045&view=rev
Author: tfry
Date: 2007-01-02 05:24:57 -0800 (Tue, 02 Jan 2007)
Log Message:
-----------
krazy fixes
Modified Paths:
--------------
trunk/rkward/rkward/windows/detachedwindowcontainer.h
trunk/rkward/rkward/windows/rcontrolwindow.cpp
trunk/rkward/rkward/windows/rcontrolwindow.h
trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
trunk/rkward/rkward/windows/rkcommandeditorwindow.h
trunk/rkward/rkward/windows/rkcommandlog.cpp
trunk/rkward/rkward/windows/rkcommandlog.h
trunk/rkward/rkward/windows/rkhtmlwindow.cpp
trunk/rkward/rkward/windows/rkwindowcatcher.cpp
trunk/rkward/rkward/windows/rkwindowcatcher.h
trunk/rkward/rkward/windows/rkworkplace.cpp
trunk/rkward/rkward/windows/rkworkplace.h
trunk/rkward/rkward/windows/rkworkplaceview.h
Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.h
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -33,8 +33,8 @@
public:
/** constructor.
@param widget_to_capture The window to reparent into the detached window */
- DetachedWindowContainer (RKMDIWindow *widget_to_capture);
-/** destructor. Usually you don't call this explicitely, but rather delete/close the child view. The DetachedWindowContainer will then self destruct via viewDestroyed () */
+ explicit DetachedWindowContainer (RKMDIWindow *widget_to_capture);
+/** destructor. Usually you don't call this explicitly, but rather delete/close the child view. The DetachedWindowContainer will then self destruct via viewDestroyed () */
~DetachedWindowContainer ();
public slots:
Modified: trunk/rkward/rkward/windows/rcontrolwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rcontrolwindow.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rcontrolwindow.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -355,14 +355,14 @@
setText (0, dummy);
dummy = "";
- if (command->type () & RCommand::User) dummy += "U";
- if (command->type () & RCommand::Plugin) dummy += "P";
- if (command->type () & RCommand::PluginCom) dummy += "C";
- if (command->type () & RCommand::App) dummy += "A";
- if (command->type () & RCommand::Sync) dummy += "S";
- if (command->type () & RCommand::EmptyCommand) dummy += "E";
- if (command->type () & (RCommand::GetIntVector | RCommand::GetRealVector | RCommand::GetStringVector)) dummy += "D";
- if (command->type () & RCommand::DirectToOutput) dummy += "O";
+ if (command->type () & RCommand::User) dummy += 'U';
+ if (command->type () & RCommand::Plugin) dummy += 'P';
+ if (command->type () & RCommand::PluginCom) dummy += 'C';
+ if (command->type () & RCommand::App) dummy += 'A';
+ if (command->type () & RCommand::Sync) dummy += 'S';
+ if (command->type () & RCommand::EmptyCommand) dummy += 'E';
+ if (command->type () & (RCommand::GetIntVector | RCommand::GetRealVector | RCommand::GetStringVector)) dummy += 'D';
+ if (command->type () & RCommand::DirectToOutput) dummy += 'O';
setText (1, dummy);
if (command->getStatus () & RCommand::Canceled) setText (2, i18n ("Cancelled"));
Modified: trunk/rkward/rkward/windows/rcontrolwindow.h
===================================================================
--- trunk/rkward/rkward/windows/rcontrolwindow.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rcontrolwindow.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -51,7 +51,7 @@
protected:
/** constructor. Protected. Do not create an instance of this class directly. Rather, create a RControlWindowPart.
@param parent parent QWidget, usually RKGlobals::rkApp () or similar */
- RControlWindow (QWidget *parent = 0);
+ explicit RControlWindow (QWidget *parent = 0);
/** destructor */
~RControlWindow ();
public:
@@ -125,9 +125,9 @@
class RControlWindowListViewItem : public QListViewItem {
public:
/** constructor. */
- RControlWindowListViewItem (QListViewItem *parent);
+ explicit RControlWindowListViewItem (QListViewItem *parent);
/** constructor. */
- RControlWindowListViewItem (QListView *parent);
+ explicit RControlWindowListViewItem (QListView *parent);
/** destructor */
~RControlWindowListViewItem ();
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -226,7 +226,7 @@
uint para=0; uint p=0;
m_view->cursorPosition (¶, &p);
- QString line = m_view->currentTextLine() + " ";
+ QString line = m_view->currentTextLine() + ' ';
RKGlobals::helpDialog ()->getContextHelp (line, p);
}
@@ -334,7 +334,7 @@
void RKFunctionArgHinter::tryArgHint () {
RK_TRACE (COMMANDEDITOR);
- // do this in the next event cycle to make sure any inserted characters have truely been inserted
+ // do this in the next event cycle to make sure any inserted characters have truly been inserted
QTimer::singleShot (0, this, SLOT (tryArgHintNow ()));
}
@@ -407,7 +407,7 @@
}
// initialize and show popup
- arghints_popup_text->setText (effective_symbol + " (" + static_cast<RFunctionObject*> (object)->printArgs () + ")");
+ arghints_popup_text->setText (effective_symbol + " (" + static_cast<RFunctionObject*> (object)->printArgs () + ')');
arghints_popup->resize (arghints_popup_text->sizeHint () + QSize (2, 2));
arghints_popup->move (view->mapToGlobal (view->cursorCoordinates () + QPoint (0, arghints_popup->height ())));
arghints_popup->show ();
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.h
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -114,7 +114,7 @@
bool provideContext (unsigned int line_rev, QString *context, int *cursor_position);
public slots:
-/** update Tab caption according to the current url. Display the filename-component of the URL, or - if not available - a more elaborate description of the url. Also appends a "[modified]" if approriate */
+/** update Tab caption according to the current url. Display the filename-component of the URL, or - if not available - a more elaborate description of the url. Also appends a "[modified]" if appropriate */
void updateCaption ();
/** called whenever it might be appropriate to show a code completion box. The box is not shown immediately, but only after a timeout (if at all) */
void tryCompletionProxy ();
Modified: trunk/rkward/rkward/windows/rkcommandlog.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -104,7 +104,7 @@
log_view->setItalic (true);
- log_view->append (command->command () + "\n");
+ log_view->append (command->command () + '\n');
checkRaiseWindow (command);
linesAdded ();
@@ -174,7 +174,7 @@
} else if (command->errorSyntax ()) {
addOutputNoCheck (command, i18n ("Syntax error.\n"));
} else {
- addOutputNoCheck (command, i18n ("An unspecified error occured while running the command.\n"));
+ addOutputNoCheck (command, i18n ("An unspecified error occurred while running the command.\n"));
}
}
}
Modified: trunk/rkward/rkward/windows/rkcommandlog.h
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkcommandlog.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -56,7 +56,7 @@
/** the log_view emits this, when it should be raised (apparently this can only be done from the main frame) */
void raiseWindow ();
protected:
-/** Command has finished. If the command has failed, it may be neccessary to print some more information */
+/** Command has finished. If the command has failed, it may be necessary to print some more information */
void rCommandDone (RCommand *command);
RKCommandLog ();
~RKCommandLog ();
@@ -105,7 +105,7 @@
class RKCommandLogPart : public KParts::Part {
Q_OBJECT
public:
- RKCommandLogPart (RKCommandLog *for_log);
+ explicit RKCommandLogPart (RKCommandLog *for_log);
~RKCommandLogPart ();
public slots:
void doPopupMenu (const QPoint &pos);
Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -289,7 +289,7 @@
void RKOutputWindow::flushOutput () {
RK_TRACE (APP);
- int res = KMessageBox::questionYesNo (this, i18n ("Do you really want to flush the ouput? It won't be possible to restore it."), i18n ("Flush output?"));
+ int res = KMessageBox::questionYesNo (this, i18n ("Do you really want to flush the output? It will not be possible to restore it."), i18n ("Flush output?"));
if (res==KMessageBox::Yes) {
QFile out_file (RKSettingsModuleGeneral::filesPath () + "/rk_out.html");
out_file.remove ();
Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -220,7 +220,7 @@
void RKCaughtX11Window::activateDevice () {
RK_TRACE (MISC);
- RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")", RCommand::App, i18n ("Activate graphics device number %1").arg (QString::number (device_number)), error_dialog);
+ RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ')', RCommand::App, i18n ("Activate graphics device number %1").arg (QString::number (device_number)), error_dialog);
}
void RKCaughtX11Window::copyDeviceToOutput () {
Modified: trunk/rkward/rkward/windows/rkwindowcatcher.h
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -34,7 +34,7 @@
- this wrapper could watch the list of devices (curDevice, numDevices), see also addDevice to find out how the list is kept internally
- if a new device gets added grab its winId and capture
- Plan B:
- - it looks like there's no way to get acces to R_setX11Routines or at least the needed struct R_X11Routines. (?)
+ - it looks like there's no way to get access to R_setX11Routines or at least the needed struct R_X11Routines. (?)
- the level above that seems to be do_X11
- maybe we can modify the mapping from .Internal (X11) to do_X11 and insert wrapper from Plan A -> R_FunTab
- proceed like in Plan A
@@ -139,7 +139,7 @@
public:
/** constructor.
@param window The RKCatehdX11Window for this part */
- RKCaughtX11WindowPart (RKCaughtX11Window *window);
+ explicit RKCaughtX11WindowPart (RKCaughtX11Window *window);
/** destructor */
~RKCaughtX11WindowPart ();
private:
Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp 2007-01-02 13:24:57 UTC (rev 1045)
@@ -208,7 +208,7 @@
ed->setCaption (iobj->getShortName ()); // TODO: move to editor
ed->setIcon (SmallIcon ("spreadsheet"));
addWindow (ed);
- ed->setFocus (); // somehow we need to call this explicitely
+ ed->setFocus (); // somehow we need to call this explicitly
}
}
@@ -298,7 +298,7 @@
RK_TRACE (APP);
if (RKSettingsModuleGeneral::workplaceSaveMode () != RKSettingsModuleGeneral::SaveWorkplaceWithWorkspace) return;
- QString workplace_description = "c (";
+ QString workplace_description;
bool first = true;
for (RKWorkplaceObjectList::const_iterator it = windows.constBegin (); it != windows.constEnd (); ++it) {
@@ -306,7 +306,7 @@
else workplace_description.append (", ");
workplace_description.append (RObject::rQuote ((*it)->getDescription ()));
}
- workplace_description = ".rk.workplace.save <- " + workplace_description + ")";
+ workplace_description = ".rk.workplace.save <- c (" + workplace_description + ')';
RKGlobals::rInterface ()->issueCommand (workplace_description, RCommand::App | RCommand::Sync, i18n ("Save Workplace layout"), 0, 0, chain);
}
Modified: trunk/rkward/rkward/windows/rkworkplace.h
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkworkplace.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -39,7 +39,7 @@
public:
/** ctor.
@param parent: The parent widget for the workspace view (see view ()) */
- RKWorkplace (QWidget *parent);
+ explicit RKWorkplace (QWidget *parent);
~RKWorkplace ();
/** @returns a pointer to the view of the workplace. Since possibly the workplace layout might change, better not rely on this pointer being valid for long */
@@ -86,7 +86,7 @@
@returns a pointer to the editor */
RKEditor *editObject (RObject *object, bool initialize_to_empty=false);
-/** tell all DataEditorWindow s to syncronize changes to the R backend
+/** tell all DataEditorWindow s to synchronize changes to the R backend
// TODO: add RCommandChain parameter */
void flushAllData ();
/** Close the active (attached) window. Safe to call even if there is no current active window (no effect in that case) */
Modified: trunk/rkward/rkward/windows/rkworkplaceview.h
===================================================================
--- trunk/rkward/rkward/windows/rkworkplaceview.h 2007-01-02 13:13:24 UTC (rev 1044)
+++ trunk/rkward/rkward/windows/rkworkplaceview.h 2007-01-02 13:24:57 UTC (rev 1045)
@@ -31,7 +31,7 @@
public:
/** constructor
@param parent parent QWidget */
- RKWorkplaceView (QWidget *parent);
+ explicit RKWorkplaceView (QWidget *parent);
~RKWorkplaceView ();
/** add the given window to the view */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list